summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorneel <neel@FreeBSD.org>2013-02-13 23:22:17 +0000
committerneel <neel@FreeBSD.org>2013-02-13 23:22:17 +0000
commit0c9e7f62b24f12c063473c36e88817cb3cab746d (patch)
tree2e1b3c45a4036a8ce2094f0d18bbb9a72c933be7 /sys/amd64
parenta590bde3e505abcbe90cb98f2252363e18baac3b (diff)
downloadFreeBSD-src-0c9e7f62b24f12c063473c36e88817cb3cab746d.zip
FreeBSD-src-0c9e7f62b24f12c063473c36e88817cb3cab746d.tar.gz
Requests for invalid CPUID leaves should map to the highest known leaf instead.
Reviewed by: grehan Obtained from: NetApp
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/vmm/x86.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index 94abe09..13eaaad 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -54,8 +54,6 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id,
unsigned int func, regs[4];
enum x2apic_state x2apic_state;
- func = *eax;
-
/*
* Requests for invalid CPUID levels should map to the highest
* available level instead.
@@ -70,6 +68,8 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id,
*eax = cpu_high;
}
+ func = *eax;
+
/*
* In general the approach used for CPU topology is to
* advertise a flat topology where all CPUs are packages with
OpenPOWER on IntegriCloud