Changeset 20925 in vbox for trunk

Timestamp:

Jun 25, 2009 11:25:09 AM (16 years ago)

Author:

vboxsync

Message:

Reset paging mode back to real mode before resetting the pgm pool. Previous code triggered assertions as the CPU state was already reset and inconsistent with the paging mode.

File:

• trunk/src/VBox/VMM/PGM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -2145 +2145 @@
 
     /*
+     * Switch mode back to real mode. (before resetting the pgm pool!)
+     */
+    for (unsigned i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU  pVCpu = &pVM->aCpus[i];
+
+        rc = PGMR3ChangeMode(pVM, pVCpu, PGMMODE_REAL);
+        AssertRC(rc);
+
+        STAM_REL_COUNTER_RESET(&pVCpu->pgm.s.cGuestModeChanges);
+    }
+
+    /*
      * Reset the shadow page pool.
      */
@@ -2175 +2188 @@
          */
         rc = pgmR3PhysRomReset(pVM);
-        if (RT_SUCCESS(rc))
-        {
-            /*
-             * Switch mode back to real mode.
-             */
-            for (unsigned i=0;i<pVM->cCPUs;i++)
-            {
-                PVMCPU  pVCpu = &pVM->aCpus[i];
-
-                rc = PGMR3ChangeMode(pVM, pVCpu, PGMMODE_REAL);
-                AssertRC(rc);
-
-                STAM_REL_COUNTER_RESET(&pVCpu->pgm.s.cGuestModeChanges);
-            }
-        }
     }