Changeset 60720 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Apr 27, 2016 3:32:57 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106907

Message:

VMM/APIC: Fixes for getting x2APIC mode working.

File:

• trunk/src/VBox/VMM/VMMR3/APIC.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/APIC.cpp

@@ -244 +244 @@
 
     /* Construct. */
-    PAPICCPU pApicCpu = VMCPU_TO_APICCPU(pVCpu);
-    uint64_t uApicBaseMsr = XAPIC_APICBASE_PHYSADDR
-                          | MSR_APICBASE_XAPIC_ENABLE_BIT;
+    PAPICCPU pApicCpu     = VMCPU_TO_APICCPU(pVCpu);
+    PAPIC    pApic        = VM_TO_APIC(pVCpu->CTX_SUFF(pVM));
+    uint64_t uApicBaseMsr = XAPIC_APICBASE_PHYSADDR;
     if (pVCpu->idCpu == 0)
         uApicBaseMsr |= MSR_APICBASE_BOOTSTRAP_CPU_BIT;
 
-    /* Update CPUID. */
-    APICUpdateCpuIdForMode(pVCpu->CTX_SUFF(pVM), APICMODE_XAPIC);
-    LogRel(("APIC%u: Switched mode to xAPIC\n", pVCpu->idCpu));
+    /* If the VM was configured with disabled mode, don't enable xAPIC mode. */
+    if (pApic->enmOriginalMode != APICMODE_DISABLED)
+    {
+        uApicBaseMsr |= MSR_APICBASE_XAPIC_ENABLE_BIT;
+
+        /** @todo CPUID bits needs to be done on a per-VCPU basis! */
+        CPUMSetGuestCpuIdFeature(pVCpu->CTX_SUFF(pVM), CPUMCPUIDFEATURE_APIC);
+        LogRel(("APIC%u: Switched mode to xAPIC\n", pVCpu->idCpu));
+    }
 
     /* Commit. */
@@ -1452 +1458 @@
     rc = CFGMR3QueryU8Def(pCfg, "Mode", &uOriginalMode, APICMODE_XAPIC);
     AssertLogRelRCReturn(rc, rc);
+
     /* Validate APIC modes. */
-    switch (uOriginalMode)
+    APICMODE const enmOriginalMode = (APICMODE)uOriginalMode;
+    switch (enmOriginalMode)
     {
         case APICMODE_DISABLED:
+            pApic->enmOriginalMode = enmOriginalMode;
+            CPUMClearGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_APIC);
+            CPUMClearGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_X2APIC);
+            break;
+
         case APICMODE_X2APIC:
+            pApic->enmOriginalMode = enmOriginalMode;
+            CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_X2APIC);
+            break;
+
         case APICMODE_XAPIC:
-            pApic->enmOriginalMode = (APICMODE)uOriginalMode;
+            pApic->enmOriginalMode = enmOriginalMode;
+            /* The CPUID bit will be updated in apicR3ResetBaseMsr(). */
             break;
+
         default:
             return VMR3SetError(pVM->pUVM, VERR_INVALID_STATE, RT_SRC_POS, "APIC mode %#x unknown.", uOriginalMode);