Changeset 17546 in vbox

Timestamp:

Mar 9, 2009 2:29:49 AM (16 years ago)

Author:

vboxsync

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

43982

Message:

VMM: Don't make host calls for Assertion or logging purposes when we're already in one, it will kind of screw things up in really weird ways. Increased the size of VMM::szRing0AssertMsg1, it was too small for some of the more elaborate assertions.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• src/VBox/VMM/VMMInternal.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/vm.h

@@ -597 +597 @@
         struct VMM  s;
 #endif
-        char        padding[1536];       /* multiple of 32 */
+        char        padding[1600];       /* multiple of 32 */
     } vmm;
 

trunk/src/VBox/VMM/VMMInternal.h

@@ -283 +283 @@
      * Used for saving the assertion message text for the release log and guru
      * meditation dump. */
-    char                        szRing0AssertMsg1[256];
+    char                        szRing0AssertMsg1[512];
     /** Buffer for storing the custom message for a ring-0 assertion. */
     char                        szRing0AssertMsg2[256];

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

@@ -1106 +1106 @@
      */
 #ifdef RT_ARCH_X86
-    if (!pVM->vmm.s.CallHostR0JmpBuf.eip)
+    if (    !pVM->vmm.s.CallHostR0JmpBuf.eip
+        ||  pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #else
-    if (!pVM->vmm.s.CallHostR0JmpBuf.rip)
+    if (    !pVM->vmm.s.CallHostR0JmpBuf.rip
+        ||  pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #endif
     {
@@ -1160 +1162 @@
     {
 #ifdef RT_ARCH_X86
-        if (pVM->vmm.s.CallHostR0JmpBuf.eip)
+        if (    pVM->vmm.s.CallHostR0JmpBuf.eip
+            &&  !pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #else
-        if (pVM->vmm.s.CallHostR0JmpBuf.rip)
+        if (    pVM->vmm.s.CallHostR0JmpBuf.rip
+            &&  !pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #endif
         {