diff options
| author | jhb <jhb@FreeBSD.org> | 2014-06-13 19:10:40 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-06-13 19:10:40 +0000 |
| commit | f6a797dc57133b52a2d8569645fbfd6389656a5c (patch) | |
| tree | 5b2f0382561c4e2ab92cef573a2fe592a6afe4a6 /sys/amd64/vmm/vmm.c | |
| parent | 2dcd5ca913b612819e80fee6c6ebce613649a1f3 (diff) | |
| download | FreeBSD-src-f6a797dc57133b52a2d8569645fbfd6389656a5c.zip FreeBSD-src-f6a797dc57133b52a2d8569645fbfd6389656a5c.tar.gz | |
MFC 262139,262140,262236,262281,262532:
Various x2APIC fixes and enhancements:
- Use spinlocks for the vioapic.
- Handle the SELF_IPI MSR.
- Simplify the APIC mode switching between MMIO and x2APIC. The guest is
no longer allowed to switch modes at runtime. Instead, the desired mode
is set when the virtual machine is created.
- Disallow MMIO access in x2APIC mode and MSR access in xAPIC mode.
- Add support for x2APIC virtualization assist in Intel VT-x.
Diffstat (limited to 'sys/amd64/vmm/vmm.c')
| -rw-r--r-- | sys/amd64/vmm/vmm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 6bf69d7..353da06 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -206,7 +206,7 @@ vcpu_init(struct vm *vm, uint32_t vcpu_id) vcpu->hostcpu = NOCPU; vcpu->vcpuid = vcpu_id; vcpu->vlapic = VLAPIC_INIT(vm->cookie, vcpu_id); - vm_set_x2apic_state(vm, vcpu_id, X2APIC_ENABLED); + vm_set_x2apic_state(vm, vcpu_id, X2APIC_DISABLED); vcpu->guest_xcr0 = XFEATURE_ENABLED_X87; vcpu->guestfpu = fpu_save_area_alloc(); fpu_save_area_reset(vcpu->guestfpu); |
