Changeset 60630 in vbox

Timestamp:

Apr 21, 2016 2:39:19 PM (8 years ago)

Author:

vboxsync

Message:

VMM/APIC: Fix diagnostic logging.

File:

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

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

@@ -622 +622 @@
  *
  * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pszPrefix   A caller supplied prefix before dumping parts of the
- *                      state.
+ * @param   pszPrefix   A caller supplied prefix before dumping the state.
  */
 static void apicR3DumpState(PVMCPU pVCpu, const char *pszPrefix)
@@ -630 +629 @@
 
     /* The auxiliary state. */
-    LogRel(("APIC%u: uApicBaseMsr    = %#RX64\n", pVCpu->idCpu, pApicCpu->uApicBaseMsr));
-    LogRel(("APIC%u: uEsrInternal    = %#RX64\n", pVCpu->idCpu, pApicCpu->uEsrInternal));
+    LogRel(("APIC%u: %s\n", pVCpu->idCpu, pszPrefix));
+    LogRel(("APIC%u: uApicBaseMsr             = %#RX64\n", pVCpu->idCpu, pApicCpu->uApicBaseMsr));
+    LogRel(("APIC%u: uEsrInternal             = %#RX64\n", pVCpu->idCpu, pApicCpu->uEsrInternal));
 
     /* The timer. */
-    LogRel(("APIC%u: %s APIC Timer:\n", pVCpu->idCpu));
-    LogRel(("APIC%u: u64TimerInitial = %#RU64\n", pVCpu->idCpu, pApicCpu->u64TimerInitial));
+    LogRel(("APIC%u: u64TimerInitial          = %#RU64\n", pVCpu->idCpu, pApicCpu->u64TimerInitial));
+    LogRel(("APIC%u: uHintedTimerInitialCount = %#RU64\n", pVCpu->idCpu, pApicCpu->uHintedTimerInitialCount));
+    LogRel(("APIC%u: uHintedTimerShift        = %#RU64\n", pVCpu->idCpu, pApicCpu->uHintedTimerShift));
 
     /* The PIBs. */
-    LogRel(("APIC%u: %s APIC PIB:\n", pVCpu->idCpu, pszPrefix));
-    LogRel(("%.*Rhxs\n", sizeof(APICPIB), pApicCpu->pvApicPibR3));
-    LogRel(("APIC%u: %s APIC Level PIB:\n", pVCpu->idCpu, pszPrefix));
-    LogRel(("%.*Rhxs\n", sizeof(APICPIB), &pApicCpu->ApicPibLevel));
+    LogRel(("APIC%u: Edge PIB : %.*Rhxs\n", pVCpu->idCpu, sizeof(APICPIB), pApicCpu->pvApicPibR3));
+    LogRel(("APIC%u: Level PIB: %.*Rhxs\n", pVCpu->idCpu, sizeof(APICPIB), &pApicCpu->ApicPibLevel));
 
     /* The APIC page. */
-    LogRel(("APIC%u: %s APIC page\n:", pVCpu->idCpu, pszPrefix));
-    LogRel(("%.*Rhxs\n", sizeof(XAPICPAGE), pApicCpu->pvApicPageR3));
+    LogRel(("APIC%u: APIC page: %.*Rhxs\n", pVCpu->idCpu, sizeof(XAPICPAGE), pApicCpu->pvApicPageR3));
 }
 #endif
@@ -759 +757 @@
 
 #ifdef DEBUG_ramshankar
-        apicR3DumpState(pVCpu, "Saved");
+        apicR3DumpState(pVCpu, "Saved state:");
 #endif
     }
@@ -834 +832 @@
 
 #ifdef DEBUG_ramshankar
-            apicR3DumpState(pVCpu, "Loaded");
+            apicR3DumpState(pVCpu, "Loaded state:");
 #endif
         }