Changeset 73351 in vbox for trunk/include/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/include/VBox

Files:

• VMMDev.h (modified) (3 diffs)
• vmm/dbgf.h (modified) (2 diffs)
• vmm/vm.h (modified) (3 diffs)
• vmm/vm.mac (modified) (2 diffs)
• vmm/vmapi.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);