svn commit: r244283 - projects/bhyve/sys/amd64/vmm/io

[Neel Natu]

Author: neel
Date: Sun Dec 16 01:20:08 2012
New Revision: 244283
URL: http://svnweb.freebsd.org/changeset/base/244283

Log:
  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

Modified:
  projects/bhyve/sys/amd64/vmm/io/vlapic.c

Modified: projects/bhyve/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/io/vlapic.c	Sun Dec 16 00:57:14 2012	(r244282)
+++ projects/bhyve/sys/amd64/vmm/io/vlapic.c	Sun Dec 16 01:20:08 2012	(r244283)
@@ -896,8 +896,6 @@ vlapic_set_x2apic_state(struct vm *vm, i
 
 	vlapic = vm_lapic(vm, vcpuid);
 
-	if (state == X2APIC_ENABLED)
-		vlapic->msr_apicbase |= APICBASE_X2APIC;
-	else
+	if (state == X2APIC_DISABLED)
 		vlapic->msr_apicbase &= ~APICBASE_X2APIC;
 }