summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorneel <neel@FreeBSD.org>2012-12-16 01:20:08 +0000
committerneel <neel@FreeBSD.org>2012-12-16 01:20:08 +0000
commitbc64633d9d492d8fadbd7972ea2ae81a660233a3 (patch)
tree088042a531643fb6f75acb1da7c92fe7bb89e793 /sys/amd64
parent7d7f92fbade54e46285282d2c5f456298084d794 (diff)
downloadFreeBSD-src-bc64633d9d492d8fadbd7972ea2ae81a660233a3.zip
FreeBSD-src-bc64633d9d492d8fadbd7972ea2ae81a660233a3.tar.gz
Modify the default behavior of bhyve such that it no longer forces the use of
x2apic mode on the guest. The guest can decide whether or not it wants to use legacy mmio or x2apic access to the APIC by writing to the MSR_APICBASE register. Obtained from: NetApp
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/vmm/io/vlapic.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
index 911ed64..15fc6c2 100644
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -896,8 +896,6 @@ vlapic_set_x2apic_state(struct vm *vm, int vcpuid, enum x2apic_state state)
vlapic = vm_lapic(vm, vcpuid);
- if (state == X2APIC_ENABLED)
- vlapic->msr_apicbase |= APICBASE_X2APIC;
- else
+ if (state == X2APIC_DISABLED)
vlapic->msr_apicbase &= ~APICBASE_X2APIC;
}
OpenPOWER on IntegriCloud