Changeset 61715 in vbox

Timestamp:

Jun 15, 2016 1:18:40 PM (9 years ago)

Author:

vboxsync

Message:

DevAPIC: Don't assert while dumping debugger info when not on EMT, assume EMT0 for now.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -2067 +2067 @@
     uint64_t u64;
 
-    pHlp->pfnPrintf(pHlp, "Local APIC at %08llx:\n", pApic->apicbase);
+    pHlp->pfnPrintf(pHlp, "CPU%u: Local APIC at %08llx:\n", pApic->phys_id, pApic->apicbase);
     u64 = apicR3InfoReadReg(pDev, pApic, 0x2);
     pHlp->pfnPrintf(pHlp, "  LAPIC ID  : %08llx\n", u64);
@@ -2167 +2167 @@
 {
     APICDeviceInfo  *pDev  = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
-    APICState       *pApic = apicGetStateByCurEmt(pDev);
+    PVM              pVM   = PDMDevHlpGetVM(pDevIns);
+    VMCPUID          idCpu = VMMGetCpuId(pVM);
+    if (idCpu == NIL_VMCPUID)  /* Don't crash if we're not on EMT, just assume EMT0 for now. */
+        idCpu = 0;
+    APICState       *pApic = apicGetStateById(pDev, idCpu);
 
     if (pszArgs == NULL || !*pszArgs || !strcmp(pszArgs, "basic"))