Changeset 18835 in vbox for trunk/src/VBox

Timestamp:

Apr 7, 2009 4:24:55 PM (16 years ago)

Author:

vboxsync

Message:

PGMAllBth.h: Fix for CR3 mismatch assertion in strict builds when nipping back to ring-3 to grab the PGM lock. Grab the lock before entering dangerous waters...

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4254 +4254 @@
     /* NOTE: We can't deal with jumps to ring 3 here as we're now in an inconsistent state! */
     bool fLog = VMMGCLogDisable(pVM);
+    pgmLock(pVM);
 #  endif
 
@@ -4288 +4289 @@
 
 #  ifdef IN_RC
+    pgmUnlock(pVM);
     VMMGCLogRestore(pVM, fLog);
 #  endif
@@ -4322 +4324 @@
     int rc = VINF_SUCCESS;
 
-    /* Update guest paging info. */
+    /*
+     * Update guest paging info.
+     */
 #if PGM_GST_TYPE == PGM_TYPE_32BIT
     pVM->pgm.s.pGst32BitPdR3 = 0;
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
+# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
     pVM->pgm.s.pGst32BitPdR0 = 0;
-#endif
+# endif
     pVM->pgm.s.pGst32BitPdRC = 0;
 
@@ -4357 +4361 @@
 
 #if !defined(IN_RC) /* In RC we rely on MapCR3 to do the shadow part for us at a safe time */
-    /* Update shadow paging info. */
+    /*
+     * Update shadow paging info.
+     */
 # if  (   (   PGM_SHW_TYPE == PGM_TYPE_32BIT  \
            || PGM_SHW_TYPE == PGM_TYPE_PAE    \