Changeset 12479 in vbox for trunk/src

Timestamp:

Sep 16, 2008 9:14:29 AM (16 years ago)

Author:

vboxsync

Message:

Also print ring 0 release assertion messages to the release log. Now we get meaningless
VINF_EM_DBG_HYPER_ASSERTION guru meditations.

Bumped the minor version of the support driver, because of new exports.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (1 diff)
• HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• HostDrivers/Support/SUPR0.def (modified) (1 diff)
• VMM/VMM.cpp (modified) (1 diff)
• VMM/VMMInternal.h (modified) (1 diff)
• VMM/VMMR0/VMMR0.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -387 +387 @@
     { "AssertMsg1",                             (void *)UNWIND_WRAP(AssertMsg1) },
     { "AssertMsg2",                             (void *)AssertMsg2 }, /** @todo replace this by RTAssertMsg2V */
+    { "RTStrPrintf",                            (void *)RTStrPrintf }, 
+    { "RTStrPrintfV",                           (void *)RTStrPrintfV }, 
 };
 

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -182 +182 @@
  * The upper 16-bit is the major version, the the lower the minor version.
  * When incompatible changes are made, the upper major number has to be changed. */
-#define SUPDRV_IOC_VERSION                              0x00090000
+#define SUPDRV_IOC_VERSION                              0x00090001
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPR0.def

@@ -115 +115 @@
     AssertMsg1
     AssertMsg2
+    RTStrPrintf
+    RTStrPrintfV
+    
 
     ; data

trunk/src/VBox/VMM/VMM.cpp

@@ -2275 +2275 @@
             pVM->vmm.s.CallHostR0JmpBuf.rip = 0;
 #endif
+            LogRel((pVM->vmm.s.szRing0AssertMsg1));
+            LogRel((pVM->vmm.s.szRing0AssertMsg2));
             return VINF_EM_DBG_HYPER_ASSERTION;
 

trunk/src/VBox/VMM/VMMInternal.h

@@ -250 +250 @@
     /** The Ring-0 jmp buffer. */
     VMMR0JMPBUF                 CallHostR0JmpBuf;
+    /** Buffer for storing ring 0 assertion output, so we can reroute it to the release log. */
+    char                        szRing0AssertMsg1[256];
+    char                        szRing0AssertMsg2[256];
     /** @} */
 

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -45 +45 @@
 #include <iprt/stdarg.h>
 #include <iprt/mp.h>
+#include <iprt/string.h>
 
 #if defined(_MSC_VER) && defined(RT_ARCH_AMD64) /** @todo check this with with VC7! */
@@ -1155 +1156 @@
                "Location  : %s(%d) %s\n",
                pszExpr, pszFile, uLine, pszFunction));
+
+    PVM pVM = GVMMR0GetVMByEMT(NIL_RTNATIVETHREAD);
+    if (pVM)
+        RTStrPrintf(pVM->vmm.s.szRing0AssertMsg1, sizeof(pVM->vmm.s.szRing0AssertMsg1), 
+                    "\n!!R0-Assertion Failed!!\n"
+                    "Expression: %s\n"
+                    "Location  : %s(%d) %s\n",
+                    pszExpr, pszFile, uLine, pszFunction);
 }
 
@@ -1185 +1194 @@
         va_start(args, pszFormat);
         RTLogFormatV(rtLogOutput, pLog, pszFormat, args);
+        PVM pVM = GVMMR0GetVMByEMT(NIL_RTNATIVETHREAD);
+        if (pVM)
+            RTStrPrintfV(pVM->vmm.s.szRing0AssertMsg2, sizeof(pVM->vmm.s.szRing0AssertMsg2), pszFormat, args);
         va_end(args);
     }