svn commit: r243325 - projects/bhyve/sys/amd64/vmm

[Peter Grehan]

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)