Changeset 10340 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 7, 2008 4:58:59 PM (16 years ago)

Author:

vboxsync

Message:

Pool flush handling updates

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (3 diffs)
• PGMAllBth.h (modified) (1 diff)
• PGMAllGst.h (modified) (2 diffs)

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

@@ -756 +756 @@
         {
             Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            rc = pgmPoolSyncCR3(pVM);
+            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+            return VINF_PGM_SYNC_CR3;
         }
         AssertRCReturn(rc, rc);
@@ -851 +852 @@
         {
             Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            rc = pgmPoolSyncCR3(pVM);
+            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+            return VINF_PGM_SYNC_CR3;
         }
         AssertRCReturn(rc, rc);
@@ -891 +893 @@
         {
             Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
-            rc = pgmPoolSyncCR3(pVM);
+            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+            return VINF_PGM_SYNC_CR3;
         }
         AssertRCReturn(rc, rc);

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

@@ -2354 +2354 @@
         else if (rc == VERR_PGM_POOL_FLUSHED)
         {
-            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3); /** @todo no need to do global sync, right? */
+            VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
             return VINF_PGM_SYNC_CR3;
         }

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

@@ -492 +492 @@
 
                 Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
+try_again:
                 rc = pgmPoolAlloc(pVM, GCPhysCR3, PGMPOOLKIND_64BIT_PML4_FOR_64BIT_PML4, PGMPOOL_IDX_AMD64_CR3, GCPhysCR3 >> PAGE_SHIFT, &pVM->pgm.s.pHCShwAmd64CR3);
                 if (rc == VERR_PGM_POOL_FLUSHED)
@@ -498 +499 @@
                     rc = pgmPoolSyncCR3(pVM);
                     AssertRC(rc);
+                    goto try_again;
                 }
                 pVM->pgm.s.pHCPaePML4    = (PX86PML4)PGMPOOL_PAGE_2_PTR(pPool->CTXSUFF(pVM), pVM->pgm.s.pHCShwAmd64CR3);