From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 20 06:01:04 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 1D6A26FF;
 Tue, 20 Nov 2012 06:01:04 +0000 (UTC)
 (envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 042078FC0C;
 Tue, 20 Nov 2012 06:01:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAK613wP041616;
 Tue, 20 Nov 2012 06:01:03 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAK613Yb041614;
 Tue, 20 Nov 2012 06:01:03 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201211200601.qAK613Yb041614@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Tue, 20 Nov 2012 06:01:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243325 - projects/bhyve/sys/amd64/vmm
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, 20 Nov 2012 06:01:04 -0000

Author: grehan
Date: Tue Nov 20 06:01:03 2012
New Revision: 243325
URL: http://svnweb.freebsd.org/changeset/base/243325

Log:
  Handle CPUID leaf 0x7 now that FreeBSD is using it.
  Return 0's for now.
  
  Reviewed by:	neel
  Obtained from:	NetApp

Modified:
  projects/bhyve/sys/amd64/vmm/x86.c
  projects/bhyve/sys/amd64/vmm/x86.h

Modified: projects/bhyve/sys/amd64/vmm/x86.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/x86.c	Tue Nov 20 04:45:04 2012	(r243324)
+++ projects/bhyve/sys/amd64/vmm/x86.c	Tue Nov 20 06:01:03 2012	(r243325)
@@ -162,6 +162,7 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 			break;
 
 		case CPUID_0000_0006:
+		case CPUID_0000_0007:
 			/*
 			 * Handle the access, but report 0 for
 			 * all options

Modified: projects/bhyve/sys/amd64/vmm/x86.h
==============================================================================
--- projects/bhyve/sys/amd64/vmm/x86.h	Tue Nov 20 04:45:04 2012	(r243324)
+++ projects/bhyve/sys/amd64/vmm/x86.h	Tue Nov 20 06:01:03 2012	(r243325)
@@ -35,6 +35,7 @@
 #define CPUID_0000_0003 (0x3)
 #define CPUID_0000_0004 (0x4)
 #define CPUID_0000_0006 (0x6)
+#define CPUID_0000_0007 (0x7)
 #define	CPUID_0000_000A	(0xA)
 #define	CPUID_0000_000B	(0xB)
 #define CPUID_8000_0000	(0x80000000)