Changeset 60655 in vbox

Timestamp:

Apr 22, 2016 3:32:41 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Don't need to update CPUID twice on VM startup and fix logging.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/APICAll.cpp (modified) (5 diffs)
• VMMR3/APIC.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp

@@ -2025 +2025 @@
 
                 APICUpdateCpuIdForMode(pVCpu->CTX_SUFF(pVM), APICMODE_DISABLED);
-                Log2(("APIC%u: Switched mode to disabled\n", pVCpu->idCpu));
+                LogRel(("APIC%u: Switched mode to disabled\n", pVCpu->idCpu));
                 break;
             }
@@ -2033 +2033 @@
                 if (enmOldMode != APICMODE_DISABLED)
                 {
-                    Log(("APIC%u: Can only transition to xAPIC state from disabled state\n", pVCpu->idCpu));
+                    LogRel(("APIC%u: Can only transition to xAPIC state from disabled state\n", pVCpu->idCpu));
                     return apicMsrAccessError(pVCpu, MSR_IA32_APICBASE, APICMSRACCESS_WRITE_INVALID);
                 }
@@ -2039 +2039 @@
                 uBaseMsr |= MSR_APICBASE_XAPIC_ENABLE_BIT;
                 APICUpdateCpuIdForMode(pVCpu->CTX_SUFF(pVM), APICMODE_XAPIC);
-                Log2(("APIC%u: Switched mode to xApic\n", pVCpu->idCpu));
+                LogRel(("APIC%u: Switched mode to xAPIC\n", pVCpu->idCpu));
                 break;
             }
@@ -2047 +2047 @@
                 if (enmOldMode != APICMODE_XAPIC)
                 {
-                    Log(("APIC%u: Can only transition to x2APIC state from xAPIC state\n", pVCpu->idCpu));
+                    LogRel(("APIC%u: Can only transition to x2APIC state from xAPIC state\n", pVCpu->idCpu));
                     return apicMsrAccessError(pVCpu, MSR_IA32_APICBASE, APICMSRACCESS_WRITE_INVALID);
                 }
@@ -2071 +2071 @@
                                                   | (UINT32_C(1) << pX2ApicPage->id.u32ApicId & UINT32_C(0xf));
 
-                Log2(("APIC%u: Switched mode to x2Apic\n", pVCpu->idCpu));
+                LogRel(("APIC%u: Switched mode to x2APIC\n", pVCpu->idCpu));
                 break;
             }

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

@@ -251 +251 @@
     /* Update CPUID. */
     APICUpdateCpuIdForMode(pVCpu->CTX_SUFF(pVM), APICMODE_XAPIC);
+    LogRel(("APIC%u: Switched mode to xAPIC\n", pVCpu->idCpu));
 
     /* Commit. */
@@ -1350 +1351 @@
     AssertLogRelRCReturn(rc, rc);
     pApicDev->pCritSectR3 = pApicDev->pApicHlpR3->pfnGetR3CritSect(pDevIns);
-
-    /*
-     * Update the CPUID bits.
-     */
-    APICUpdateCpuIdForMode(pVM, pApic->enmOriginalMode);
-    LogRel(("APIC: Switched mode to %s\n", apicGetModeName(pApic->enmOriginalMode)));
 
     /*