Changeset 73351 in vbox

Timestamp:

Jul 25, 2018 1:02:11 PM (7 years ago)

Author:

vboxsync

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

123965

Message:

VBoxGuest,VMMDev,DBGF,VM: Added bug check report to VBoxGuest/VMMDev and hooked it up to DBGF. Made DBGF remember the last reported bug check, adding an info handler for displaying it. Added VM reset counters w/ getters for use in bug check reporting.

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (3 diffs)
• include/VBox/vmm/dbgf.h (modified) (2 diffs)
• include/VBox/vmm/vm.h (modified) (3 diffs)
• include/VBox/vmm/vm.mac (modified) (2 diffs)
• include/VBox/vmm/vmapi.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (modified) (1 diff)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMAll/GIMAllHv.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/VMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/DBGF.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/DBGFR3BugCheck.cpp (modified) (13 diffs)
• src/VBox/VMM/VMMR3/VM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/DBGFInternal.h (modified) (2 diffs)
• src/VBox/VMM/include/VMInternal.h (modified) (1 diff)

trunk/include/VBox/VMMDev.h

@@ -187 +187 @@
     VMMDevReq_GuestHeartbeat             = 219,
     VMMDevReq_HeartbeatConfigure         = 220,
+    VMMDevReq_NtBugCheck                 = 221,
     VMMDevReq_SizeHack                   = 0x7fffffff
 } VMMDevRequestType;
@@ -1516 +1517 @@
 AssertCompileSize(VMMDevReqWriteCoreDump, 24+4);
 
-/** Heart beat check state structure.
- *  Used by VMMDevReq_HeartbeatConfigure. */
+
+/**
+ * Heart beat check state structure.
+ * Used by VMMDevReq_HeartbeatConfigure.
+ */
 typedef struct
 {
@@ -1528 +1532 @@
 } VMMDevReqHeartbeat;
 AssertCompileSize(VMMDevReqHeartbeat, 24+12);
+
+
+/**
+ * NT bug check report.
+ * Used by VMMDevReq_NtBugCheck.
+ * @remarks  Can be issued with just the header if no more data is available.
+ */
+typedef struct
+{
+    /** Header. */
+    VMMDevRequestHeader         header;
+    /** The bug check number (P0). */
+    uint64_t                    uBugCheck;
+    /** The four bug check parameters. */
+    uint64_t                    auParameters[4];
+} VMMDevReqNtBugCheck;
+AssertCompileSize(VMMDevReqNtBugCheck, 24+40);
 
 

trunk/include/VBox/vmm/dbgf.h

@@ -419 +419 @@
     /** Windows guest reported BSOD via EFI variables. */
     DBGFEVENT_BSOD_EFI,
+    /** Windows guest reported BSOD via VMMDev. */
+    DBGFEVENT_BSOD_VMMDEV,
 
     /** End of valid event values. */
@@ -2716 +2718 @@
 /** @defgroup grp_dbgf_misc  Misc DBGF interfaces.
  * @{ */
+VMMR3DECL(VBOXSTRICTRC)      DBGFR3ReportBugCheck(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent, uint64_t uBugCheck,
+                                                  uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4);
 VMMR3DECL(int)               DBGFR3FormatBugCheck(PUVM pUVM, char *pszDetails, size_t cbDetails,
                                                   uint64_t uP0, uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4);

trunk/include/VBox/vmm/vm.h

@@ -1335 +1335 @@
         } const     ro;
 #endif
-        uint8_t     padding[2368];      /* multiple of 64 */
+        uint8_t     padding[2432];      /* multiple of 64 */
     } dbgf;
 
@@ -1411 +1411 @@
         struct VMINT s;
 #endif
-        uint8_t     padding[24];        /* multiple of 8 */
+        uint8_t     padding[32];        /* multiple of 8 */
     } vm;
 
@@ -1425 +1425 @@
     /** Padding for aligning the cpu array on a page boundary. */
 #if defined(VBOX_WITH_REM) && defined(VBOX_WITH_RAW_MODE)
-    uint8_t         abAlignment2[3742];
+    uint8_t         abAlignment2[3670];
 #elif defined(VBOX_WITH_REM) && !defined(VBOX_WITH_RAW_MODE)
-    uint8_t         abAlignment2[1502];
+    uint8_t         abAlignment2[1430];
 #elif !defined(VBOX_WITH_REM) && defined(VBOX_WITH_RAW_MODE)
-    uint8_t         abAlignment2[3998];
-#else
-    uint8_t         abAlignment2[1758];
+    uint8_t         abAlignment2[3926];
+#else
+    uint8_t         abAlignment2[1686];
 #endif
 

trunk/include/VBox/vmm/vm.mac

@@ -164 +164 @@
     .nem                    resb 128
     .tm                     resb 2496
-    .dbgf                   resb 2368
+    .dbgf                   resb 2432
     .ssm                    resb 128
     .ftm                    resb 512
@@ -176 +176 @@
     .gim                    resb 448
     .apic                   resb 128
-    .vm                     resb 24
+    .vm                     resb 32
     .cfgm                   resb 8
     alignb 4096

trunk/include/VBox/vmm/vmapi.h

@@ -210 +210 @@
 typedef FNVMATSTATE *PFNVMATSTATE;
 
-VMMDECL(const char *) VMGetStateName(VMSTATE enmState);
+VMMDECL(const char *)   VMGetStateName(VMSTATE enmState);
+
+VMMDECL(uint32_t)       VMGetResetCount(PVM pVM);
+VMMDECL(uint32_t)       VMGetSoftResetCount(PVM pVM);
+VMMDECL(uint32_t)       VMGetHardResetCount(PVM pVM);
 
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -2959 +2959 @@
 {
     if (g_pauKiBugCheckData)
+    {
         RTLogBackdoorPrintf("VBoxGuest: BugCheck! P0=%#zx P1=%#zx P2=%#zx P3=%#zx P4=%#zx\n", g_pauKiBugCheckData[0],
-                            g_pauKiBugCheckData[1],  g_pauKiBugCheckData[2], g_pauKiBugCheckData[3],  g_pauKiBugCheckData[4]);
+                            g_pauKiBugCheckData[1], g_pauKiBugCheckData[2], g_pauKiBugCheckData[3], g_pauKiBugCheckData[4]);
+
+        VMMDevReqNtBugCheck *pReq = NULL;
+        int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_NtBugCheck);
+        if (RT_SUCCESS(rc))
+        {
+            pReq->uBugCheck       = g_pauKiBugCheckData[0];
+            pReq->auParameters[0] = g_pauKiBugCheckData[1];
+            pReq->auParameters[1] = g_pauKiBugCheckData[2];
+            pReq->auParameters[2] = g_pauKiBugCheckData[3];
+            pReq->auParameters[3] = g_pauKiBugCheckData[4];
+            VbglR0GRPerform(&pReq->header);
+            VbglR0GRFree(&pReq->header);
+        }
+    }
     else
+    {
         RTLogBackdoorPrintf("VBoxGuest: BugCheck!\n");
+
+        VMMDevRequestHeader *pReqHdr = NULL;
+        int rc = VbglR0GRAlloc(&pReqHdr, sizeof(*pReqHdr), VMMDevReq_NtBugCheck);
+        if (RT_SUCCESS(rc))
+        {
+            VbglR0GRPerform(pReqHdr);
+            VbglR0GRFree(pReqHdr);
+        }
+    }
 
     RT_NOREF(pvBuffer, cbBuffer);

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -626 +626 @@
     { DBGFEVENT_BSOD_MSR,               "bsod_msr",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, DBGCSXEVT_F_BUGCHECK, NULL },
     { DBGFEVENT_BSOD_EFI,               "bsod_efi",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, DBGCSXEVT_F_BUGCHECK, NULL },
+    { DBGFEVENT_BSOD_VMMDEV,            "bsod_vmmdev",          NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, DBGCSXEVT_F_BUGCHECK, NULL },
 };
 /** Number of entries in g_aDbgcSxEvents.  */

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -85 +85 @@
 #include <VBox/AssertGuest.h>
 #include <VBox/VMMDev.h>
+#include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/mm.h>
 #include <VBox/log.h>
@@ -551 +552 @@
 
 /**
+ * Handles VMMDevReq_NtBugCheck.
+ *
+ * @returns VBox status code that the guest should see.
+ * @param   pThis     The VMMDev instance data.
+ * @param   pReqHdr   The header of the request to handle.
+ */
+static int vmmDevReqHandler_NtBugCheck(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr)
+{
+    if (pReqHdr->size == sizeof(VMMDevReqNtBugCheck))
+    {
+        VMMDevReqNtBugCheck const *pReq = (VMMDevReqNtBugCheck const *)pReqHdr;
+        DBGFR3ReportBugCheck(PDMDevHlpGetVM(pThis->pDevIns), PDMDevHlpGetVMCPU(pThis->pDevIns), DBGFEVENT_BSOD_VMMDEV,
+                             pReq->uBugCheck, pReq->auParameters[0], pReq->auParameters[1],
+                             pReq->auParameters[2], pReq->auParameters[3]);
+    }
+    else if (pReqHdr->size == sizeof(VMMDevRequestHeader))
+    {
+        LogRel(("VMMDev: NT BugCheck w/o data.\n"));
+        DBGFR3ReportBugCheck(PDMDevHlpGetVM(pThis->pDevIns), PDMDevHlpGetVMCPU(pThis->pDevIns), DBGFEVENT_BSOD_VMMDEV,
+                             0, 0, 0, 0, 0);
+    }
+    else
+        return VERR_INVALID_PARAMETER;
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Validates a publisher tag.
  *
@@ -2769 +2798 @@
         case VMMDevReq_HeartbeatConfigure:
             pReqHdr->rc = vmmDevReqHandler_HeartbeatConfigure(pThis, pReqHdr);
+            break;
+
+        case VMMDevReq_NtBugCheck:
+            pReqHdr->rc = vmmDevReqHandler_NtBugCheck(pThis, pReqHdr);
             break;
 

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

@@ -934 +934 @@
                 LogRel(("GIM: HyperV: Guest indicates a fatal condition! P0=%#RX64 P1=%#RX64 P2=%#RX64 P3=%#RX64 P4=%#RX64\n",
                         pHv->uCrashP0Msr, pHv->uCrashP1Msr, pHv->uCrashP2Msr, pHv->uCrashP3Msr, pHv->uCrashP4Msr));
-                char szDetails[512];
-                DBGFR3FormatBugCheck(pVM->pUVM, szDetails, sizeof(szDetails), pHv->uCrashP0Msr, pHv->uCrashP1Msr,
+                DBGFR3ReportBugCheck(pVM, pVCpu, DBGFEVENT_BSOD_MSR, pHv->uCrashP0Msr, pHv->uCrashP1Msr,
                                      pHv->uCrashP2Msr, pHv->uCrashP3Msr, pHv->uCrashP4Msr);
-                LogRel(("%s", szDetails));
-
-                if (DBGF_IS_EVENT_ENABLED(pVM, DBGFEVENT_BSOD_MSR))
-                    DBGFEventGenericWithArgs(pVM, pVCpu, DBGFEVENT_BSOD_MSR, DBGFEVENTCTX_OTHER, 5 /*cArgs*/, pHv->uCrashP0Msr,
-                                             pHv->uCrashP1Msr, pHv->uCrashP2Msr, pHv->uCrashP3Msr, pHv->uCrashP4Msr);
                 /* (Do not try pass VINF_EM_DBG_EVENT, doesn't work from here!) */
             }

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

@@ -391 +391 @@
 }
 
+
+/**
+ * Gets the total reset count.
+ *
+ * @returns Reset count. UINT32_MAX if @a pVM is invalid.
+ * @param   pVM         The VM handle.
+ */
+VMMDECL(uint32_t) VMGetResetCount(PVM pVM)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, UINT32_MAX);
+    return pVM->vm.s.cResets;
+}
+
+
+/**
+ * Gets the soft reset count.
+ *
+ * @returns Soft reset count. UINT32_MAX if @a pVM is invalid.
+ * @param   pVM         The VM handle.
+ */
+VMMDECL(uint32_t) VMGetSoftResetCount(PVM pVM)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, UINT32_MAX);
+    return pVM->vm.s.cSoftResets;
+}
+
+
+/**
+ * Gets the hard reset count.
+ *
+ * @returns Hard reset count. UINT32_MAX if @a pVM is invalid.
+ * @param   pVM         The VM handle.
+ */
+VMMDECL(uint32_t) VMGetHardResetCount(PVM pVM)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, UINT32_MAX);
+    return pVM->vm.s.cHardResets;
+}
+

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

@@ -186 +186 @@
                             if (RT_SUCCESS(rc))
                             {
-                                return VINF_SUCCESS;
+                                rc = dbgfR3BugCheckInit(pVM);
+                                if (RT_SUCCESS(rc))
+                                {
+                                    return VINF_SUCCESS;
+                                }
+                                dbgfR3PlugInTerm(pUVM);
                             }
                             dbgfR3OSTerm(pUVM);

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

@@ -23 +23 @@
 #include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/mm.h>
+#include <VBox/vmm/tm.h>
 #include "DBGFInternal.h"
+#include <VBox/vmm/vm.h>
 #include <VBox/vmm/uvm.h>
 #include <VBox/err.h>
@@ -29 +31 @@
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static FNDBGFHANDLERINT dbgfR3BugCheckInfo;
+
+
+/**
+ * Initializes the bug check state and registers the info callback.
+ *
+ * No termination function needed.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
+ */
+int dbgfR3BugCheckInit(PVM pVM)
+{
+    pVM->dbgf.s.BugCheck.idCpu    = NIL_VMCPUID;
+    pVM->dbgf.s.BugCheck.enmEvent = DBGFEVENT_END;
+
+    return DBGFR3InfoRegisterInternal(pVM, "bugcheck",
+                                      "Show bugcheck info.  Can specify bug check code and parameters to lookup info.",
+                                      dbgfR3BugCheckInfo);
+}
 
 
@@ -51 +78 @@
 }
 
+
 /**
  * Formats a symbol for DBGFR3FormatBugCheck.
@@ -65 +93 @@
             RTStrPrintf(pszSymbol, cchSymbol, "%s%s", pszPrefix, pSym->szName);
         else if (offDisp > 0)
-            RTStrPrintf(pszSymbol, cchSymbol, "%s%s + %RGv", pszPrefix, pSym->szName, offDisp);
+            RTStrPrintf(pszSymbol, cchSymbol, "%s%s + %#RX64", pszPrefix, pSym->szName, (uint64_t)offDisp);
         else
-            RTStrPrintf(pszSymbol, cchSymbol, "%s%s - %RGv", pszPrefix, pSym->szName, -offDisp);
+            RTStrPrintf(pszSymbol, cchSymbol, "%s%s - %#RX64", pszPrefix, pSym->szName, (uint64_t)-offDisp);
         RTDbgSymbolFree(pSym);
     }
@@ -85 +113 @@
  * @param   pszDetails          The output buffer.
  * @param   cbDetails           The size of the output buffer.
- * @param   uP0                 The bugheck code.
+ * @param   uBugCheck           The bugheck code.
  * @param   uP1                 Bug check parameter 1.
  * @param   uP2                 Bug check parameter 2.
@@ -92 +120 @@
  */
 VMMR3DECL(int) DBGFR3FormatBugCheck(PUVM pUVM, char *pszDetails, size_t cbDetails,
-                                    uint64_t uP0, uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4)
+                                    uint64_t uBugCheck, uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4)
 {
     /*
@@ -98 +126 @@
      */
     size_t cchUsed = RTStrPrintf(pszDetails, cbDetails,
-                                 "BugCheck %RX64 {%RX64, %RX64, %RX64, %RX64}\n", uP0, uP1, uP2, uP3, uP4);
+                                 "BugCheck %RX64 {%RX64, %RX64, %RX64, %RX64}\n", uBugCheck, uP1, uP2, uP3, uP4);
     if (cchUsed >= cbDetails)
         return VINF_BUFFER_OVERFLOW;
@@ -108 +136 @@
      */
     char szSym[512];
-    switch (uP0)
+    switch (uBugCheck)
     {
         case 0x00000001: cchUsed = RTStrPrintf(pszDetails, cbDetails, "APC_INDEX_MISMATCH\n"); break;
@@ -220 +248 @@
                                   "P3: %016RX64 - %s\n"
                                   "P4: %016RX64 - reserved\n",
-                                  uP0 & 0x10000000 ? "_M" : "", uP1, uP2, uP3, uP3 & RT_BIT_64(0) ? "write" : "read", uP4);
+                                  uBugCheck & 0x10000000 ? "_M" : "", uP1, uP2, uP3, uP3 & RT_BIT_64(0) ? "write" : "read", uP4);
             break;
         case 0x00000051: cchUsed = RTStrPrintf(pszDetails, cbDetails, "REGISTRY_ERROR\n"); break;
@@ -274 +302 @@
                                   "P3: %016RX64 - Xcpt address\n"
                                   "P4: %016RX64 - Context address\n",
-                                  uP0 & 0x10000000 ? "_M" : "", uP1, dbgfR3GetNtStatusName((uint32_t)uP1),
+                                  uBugCheck & 0x10000000 ? "_M" : "", uP1, dbgfR3GetNtStatusName((uint32_t)uP1),
                                   uP2, dbgfR3FormatSymbol(pUVM, szSym, sizeof(szSym), ": ", uP2),
                                   uP3, uP4);
@@ -286 +314 @@
                                   "P3: %016RX64 - reserved\n"
                                   "P4: %016RX64 - reserved\n",
-                                  uP0 & 0x10000000 ? "_M" : "", uP1, uP2, uP3, uP4);
+                                  uBugCheck & 0x10000000 ? "_M" : "", uP1, uP2, uP3, uP4);
             break;
         case 0x00000080: cchUsed = RTStrPrintf(pszDetails, cbDetails, "NMI_HARDWARE_FAILURE\n"); break;
@@ -304 +332 @@
                                   "P3: %016RX64 - Trap frame address\n"
                                   "P4: %016RX64 - reserved\n",
-                                  uP0 & 0x10000000 ? "_M" : "", uP1, dbgfR3GetNtStatusName((uint32_t)uP1),
+                                  uBugCheck & 0x10000000 ? "_M" : "", uP1, dbgfR3GetNtStatusName((uint32_t)uP1),
                                   uP2, dbgfR3FormatSymbol(pUVM, szSym, sizeof(szSym), ": ", uP2),
                                   uP3, uP4);
@@ -760 +788 @@
 }
 
+
+/**
+ * Report a bug check.
+ *
+ * @returns
+ * @param   pVM             The cross context VM structure.
+ * @param   pVCpu           The cross context per virtual CPU structure.
+ * @param   enmEvent        The kind of BSOD event this is.
+ * @param   uBugCheck       The bug check number.
+ * @param   uP1             The bug check parameter \#1.
+ * @param   uP2             The bug check parameter \#2.
+ * @param   uP3             The bug check parameter \#3.
+ * @param   uP4             The bug check parameter \#4.
+ */
+VMMR3DECL(VBOXSTRICTRC) DBGFR3ReportBugCheck(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent, uint64_t uBugCheck,
+                                             uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4)
+{
+    /*
+     * Be careful.
+     */
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    VMCPU_ASSERT_EMT_RETURN(pVCpu, VERR_INVALID_VMCPU_HANDLE);
+    const char *pszSource;
+    switch (enmEvent)
+    {
+        case DBGFEVENT_BSOD_MSR:        pszSource = "GIMHv"; break;
+        case DBGFEVENT_BSOD_EFI:        pszSource = "EFI"; break;
+        case DBGFEVENT_BSOD_VMMDEV:     pszSource = "VMMDev"; break;
+        default:
+            AssertMsgFailedReturn(("enmEvent=%d\n", enmEvent), VERR_INVALID_PARAMETER);
+    }
+
+    /*
+     * Note it down.
+     */
+    pVM->dbgf.s.BugCheck.enmEvent        = enmEvent;
+    pVM->dbgf.s.BugCheck.uBugCheck       = uBugCheck;
+    pVM->dbgf.s.BugCheck.auParameters[0] = uP1;
+    pVM->dbgf.s.BugCheck.auParameters[1] = uP2;
+    pVM->dbgf.s.BugCheck.auParameters[2] = uP3;
+    pVM->dbgf.s.BugCheck.auParameters[3] = uP4;
+    pVM->dbgf.s.BugCheck.idCpu           = pVCpu->idCpu;
+    pVM->dbgf.s.BugCheck.uTimestamp      = TMVirtualGet(pVM);
+    pVM->dbgf.s.BugCheck.uResetNo        = VMGetResetCount(pVM);
+
+    /*
+     * Log the details.
+     */
+    char szDetails[2048];
+    DBGFR3FormatBugCheck(pVM->pUVM, szDetails, sizeof(szDetails), uBugCheck, uP1, uP2, uP3, uP4);
+    LogRel(("%s: %s", pszSource, szDetails));
+
+    /*
+     * Raise debugger event.
+     */
+    VBOXSTRICTRC rc = VINF_SUCCESS;
+    if (DBGF_IS_EVENT_ENABLED(pVM, enmEvent))
+        rc = DBGFEventGenericWithArgs(pVM, pVCpu, enmEvent, DBGFEVENTCTX_OTHER, 5 /*cArgs*/, uBugCheck, uP1, uP2, uP3, uP4);
+
+    /*
+     * Take actions.
+     */
+    /** @todo Take actions on BSOD, like notifying main or stopping the VM...
+     * For testing it makes little sense to continue after a BSOD. */
+    return rc;
+}
+
+
+/**
+ * @callback_method_impl{FNDBGFHANDLERINT, bugcheck}
+ */
+static DECLCALLBACK(void) dbgfR3BugCheckInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    char szDetails[2048];
+
+    /*
+     * Any arguments for bug check formatting?
+     */
+    if (pszArgs && *pszArgs)
+        pszArgs = RTStrStripL(pszArgs);
+    if (pszArgs && *pszArgs)
+    {
+        uint64_t auData[5] = { 0, 0, 0, 0, 0 };
+        unsigned iData = 0;
+        do
+        {
+            /* Find the next hex digit  */
+            char ch;
+            while ((ch = *pszArgs) != '\0' && !RT_C_IS_XDIGIT(ch))
+                pszArgs++;
+            if (ch == '\0')
+                break;
+
+            /* Extract the number. */
+            char *pszNext = (char *)pszArgs + 1;
+            RTStrToUInt64Ex(pszArgs, &pszNext, 16, &auData[iData]);
+
+            /* Advance. */
+            pszArgs = pszNext;
+            iData++;
+        } while (iData < RT_ELEMENTS(auData) && *pszArgs);
+
+        /* Format it. */
+        DBGFR3FormatBugCheck(pVM->pUVM, szDetails, sizeof(szDetails), auData[0], auData[1], auData[2], auData[3], auData[4]);
+        pHlp->pfnPrintf(pHlp, "%s", szDetails);
+    }
+    /*
+     * Format what's been reported (if any).
+     */
+    else if (pVM->dbgf.s.BugCheck.enmEvent != DBGFEVENT_END)
+    {
+        DBGFR3FormatBugCheck(pVM->pUVM, szDetails, sizeof(szDetails), pVM->dbgf.s.BugCheck.uBugCheck,
+                             pVM->dbgf.s.BugCheck.auParameters[0], pVM->dbgf.s.BugCheck.auParameters[1],
+                             pVM->dbgf.s.BugCheck.auParameters[2], pVM->dbgf.s.BugCheck.auParameters[3]);
+        const char *pszSource  = pVM->dbgf.s.BugCheck.enmEvent == DBGFEVENT_BSOD_MSR    ? "GIMHv"
+                               : pVM->dbgf.s.BugCheck.enmEvent == DBGFEVENT_BSOD_EFI    ? "EFI"
+                               : pVM->dbgf.s.BugCheck.enmEvent == DBGFEVENT_BSOD_VMMDEV ? "VMMDev" : "<unknown>";
+        uint32_t const uFreq   = TMVirtualGetFreq(pVM);
+        uint64_t const cSecs   = pVM->dbgf.s.BugCheck.uTimestamp / uFreq;
+        uint32_t const cMillis = (pVM->dbgf.s.BugCheck.uTimestamp - cSecs * uFreq) * 1000 / uFreq;
+        pHlp->pfnPrintf(pHlp, "BugCheck on CPU #%u after %RU64.%03u s VM uptime, %u resets ago (src: %s)\n%s",
+                        pVM->dbgf.s.BugCheck.idCpu, cSecs, cMillis,  VMGetResetCount(pVM) - pVM->dbgf.s.BugCheck.uResetNo,
+                        pszSource, szDetails);
+    }
+    else
+        pHlp->pfnPrintf(pHlp, "No bug check reported.\n");
+}
+

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

@@ -2754 +2754 @@
         if (RT_FAILURE(rc))
             return rc;
+        pVM->vm.s.cResets++;
+        pVM->vm.s.cSoftResets++;
     }
 
@@ -2844 +2846 @@
         if (RT_FAILURE(rc))
             return rc;
+        pVM->vm.s.cResets++;
+        pVM->vm.s.cHardResets++;
     }
 

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -300 +300 @@
     /** INT3 breakpoint search optimizations. */
     DBGFBPSEARCHOPT             Int3;
+
+    /**
+     * Bug check data.
+     * @note This will not be reset on reset.
+     */
+    struct
+    {
+        /** The ID of the CPU reporting it. */
+        VMCPUID                 idCpu;
+        /** The event associated with the bug check (gives source).
+         * This is set to DBGFEVENT_END if no BSOD data here. */
+        DBGFEVENTTYPE           enmEvent;
+        /** The total reset count at the time (VMGetResetCount). */
+        uint32_t                uResetNo;
+        /** Explicit padding. */
+        uint32_t                uPadding;
+        /** When it was reported (TMVirtualGet). */
+        uint64_t                uTimestamp;
+        /** The bug check number.
+         * @note This is really just 32-bit wide, see KeBugCheckEx.  */
+        uint64_t                uBugCheck;
+        /** The bug check parameters. */
+        uint64_t                auParameters[4];
+    } BugCheck;
 } DBGF;
 AssertCompileMemberAlignment(DBGF, DbgEvent, 8);
@@ -490 +514 @@
 int  dbgfR3PlugInInit(PUVM pUVM);
 void dbgfR3PlugInTerm(PUVM pUVM);
+int  dbgfR3BugCheckInit(PVM pVM);
 
 

trunk/src/VBox/VMM/include/VMInternal.h

@@ -166 +166 @@
     /** The VM should power off instead of reset. */
     bool                            fPowerOffInsteadOfReset;
+    /** Reset counter (soft + hard). */
+    uint32_t                        cResets;
+    /** Hard reset counter. */
+    uint32_t                        cHardResets;
+    /** Soft reset counter. */
+    uint32_t                        cSoftResets;
 } VMINT;
 /** Pointer to the VM Internal Data (part of the VM structure). */