svn commit: r255287 - head/sys/amd64/vmm

[Peter Grehan]

Author: grehan
Date: Fri Sep  6 05:16:10 2013
New Revision: 255287
URL: http://svnweb.freebsd.org/changeset/base/255287

Log:
  Allow CPUID leaf 0xD to be read as zeroes.
  Linux reads this even though extended features
  aren't exposed.
  
  Support for 0xD will be expanded once AVX[2]
  is exposed to the guest in upcoming work.

Modified:
  head/sys/amd64/vmm/x86.c
  head/sys/amd64/vmm/x86.h

Modified: head/sys/amd64/vmm/x86.c
==============================================================================
--- head/sys/amd64/vmm/x86.c	Fri Sep  6 02:57:15 2013	(r255286)
+++ head/sys/amd64/vmm/x86.c	Fri Sep  6 05:16:10 2013	(r255287)
@@ -200,6 +200,7 @@ x86_emulate_cpuid(struct vm *vm, int vcp
 		case CPUID_0000_0006:
 		case CPUID_0000_0007:
 		case CPUID_0000_000A:
+		case CPUID_0000_000D:
 			/*
 			 * Handle the access, but report 0 for
 			 * all options

Modified: head/sys/amd64/vmm/x86.h
==============================================================================
--- head/sys/amd64/vmm/x86.h	Fri Sep  6 02:57:15 2013	(r255286)
+++ head/sys/amd64/vmm/x86.h	Fri Sep  6 05:16:10 2013	(r255287)
@@ -38,6 +38,7 @@
 #define CPUID_0000_0007 (0x7)
 #define	CPUID_0000_000A	(0xA)
 #define	CPUID_0000_000B	(0xB)
+#define	CPUID_0000_000D	(0xD)
 #define CPUID_8000_0000	(0x80000000)
 #define CPUID_8000_0001	(0x80000001)
 #define CPUID_8000_0002	(0x80000002)