Changeset 19516 in vbox

Timestamp:

May 8, 2009 9:17:47 AM (16 years ago)

Author:

vboxsync

Message:

Always call pgmPoolSyncCR3 from PGMSyncCR3 (regardless of guest paging mode as it's relevant in the nested paging case).

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (2 diffs)
• PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -1760 +1760 @@
     int rc;
 
+#ifdef PGMPOOL_WITH_MONITORING
+    /*
+     * The pool may have pending stuff and even require a return to ring-3 to
+     * clear the whole thing.
+     */
+    rc = pgmPoolSyncCR3(pVM);
+    if (rc != VINF_SUCCESS)
+        return rc;
+#endif
+
     /*
      * We might be called when we shouldn't.
@@ -1781 +1791 @@
     LogFlow(("PGMSyncCR3: cr0=%RX64 cr3=%RX64 cr4=%RX64 fGlobal=%d[%d,%d]\n", cr0, cr3, cr4, fGlobal,
              VMCPU_FF_ISSET(pVCpu, VMCPU_FF_PGM_SYNC_CR3), VMCPU_FF_ISSET(pVCpu, VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL)));
-
-#ifdef PGMPOOL_WITH_MONITORING
-    /*
-     * The pool may have pending stuff and even require a return to ring-3 to
-     * clear the whole thing.
-     */
-    rc = pgmPoolSyncCR3(pVM);
-    if (rc != VINF_SUCCESS)
-        return rc;
-#endif
 
     /*

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -2054 +2054 @@
 #endif
 
-
     pPool->cPresent = 0;
+    PGM_INVL_GUEST_TLBS();
     STAM_PROFILE_STOP(&pPool->StatClearAll, c);
 }