summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrehan <grehan@FreeBSD.org>2012-11-20 06:01:03 +0000
committergrehan <grehan@FreeBSD.org>2012-11-20 06:01:03 +0000
commit5a600cdfe44adae619eca970bef1539b3ac6ae35 (patch)
treee9164ab3a2541708b3051bc7611561d60d481371
parentca04e024ebcc0a70b6cb252dbc74f8a337aa0850 (diff)
downloadFreeBSD-src-5a600cdfe44adae619eca970bef1539b3ac6ae35.zip
FreeBSD-src-5a600cdfe44adae619eca970bef1539b3ac6ae35.tar.gz
Handle CPUID leaf 0x7 now that FreeBSD is using it.
Return 0's for now. Reviewed by: neel Obtained from: NetApp
-rw-r--r--sys/amd64/vmm/x86.c1
-rw-r--r--sys/amd64/vmm/x86.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index ca0d785..94abe09 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -162,6 +162,7 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id,
break;
case CPUID_0000_0006:
+ case CPUID_0000_0007:
/*
* Handle the access, but report 0 for
* all options
diff --git a/sys/amd64/vmm/x86.h b/sys/amd64/vmm/x86.h
index d19e1d8..368e967 100644
--- a/sys/amd64/vmm/x86.h
+++ b/sys/amd64/vmm/x86.h
@@ -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)
OpenPOWER on IntegriCloud