From owner-svn-src-projects@FreeBSD.ORG  Tue Oct 30 03:03:38 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BE44F3BF;
 Tue, 30 Oct 2012 03:03:38 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id A6D168FC22;
 Tue, 30 Oct 2012 03:03:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9U33c1X000533;
 Tue, 30 Oct 2012 03:03:38 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9U33cER000529;
 Tue, 30 Oct 2012 03:03:38 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201210300303.q9U33cER000529@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Tue, 30 Oct 2012 03:03:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242334 - in projects/bhyve/sys: dev/pci kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Oct 2012 03:03:38 -0000

Author: neel
Date: Tue Oct 30 03:03:37 2012
New Revision: 242334
URL: http://svn.freebsd.org/changeset/base/242334

Log:
  Teach FreeBSD to detect that it is a guest running inside BHyVe.
  
  Reviewed by:	grehan
  Obtained from:	NetApp

Modified:
  projects/bhyve/sys/dev/pci/pci.c
  projects/bhyve/sys/kern/subr_param.c

Modified: projects/bhyve/sys/dev/pci/pci.c
==============================================================================
--- projects/bhyve/sys/dev/pci/pci.c	Tue Oct 30 01:52:49 2012	(r242333)
+++ projects/bhyve/sys/dev/pci/pci.c	Tue Oct 30 03:03:37 2012	(r242334)
@@ -244,6 +244,7 @@ static const struct pci_quirk const pci_
 	 * but support MSI just fine.  QEMU uses the Intel 82440.
 	 */
 	{ 0x12378086, PCI_QUIRK_ENABLE_MSI_VM,	0,	0 },
+	{ 0x12751275, PCI_QUIRK_ENABLE_MSI_VM,	0, 	0 },	/* BHyVe */
 
 	/*
 	 * HPET MMIO base address may appear in Bar1 for AMD SB600 SMBus

Modified: projects/bhyve/sys/kern/subr_param.c
==============================================================================
--- projects/bhyve/sys/kern/subr_param.c	Tue Oct 30 01:52:49 2012	(r242333)
+++ projects/bhyve/sys/kern/subr_param.c	Tue Oct 30 03:03:37 2012	(r242334)
@@ -157,6 +157,7 @@ static const char *const vm_bnames[] = {
 	"Plex86",			/* Plex86 */
 	"Bochs",			/* Bochs */
 	"Xen",				/* Xen */
+	"BHYVE",			/* BHyVe */
 	NULL
 };