Changeset 17134 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Feb 25, 2009 3:10:11 PM (16 years ago)

Author:

vboxsync

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

43384

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: updates

File:

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

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

@@ -4643 +4643 @@
     uint32_t     iOldShwUserTable  = pVM->pgm.s.iShwUserTable;
     uint32_t     iOldShwUser       = pVM->pgm.s.iShwUser;
+    PPGMPOOLPAGE pNewShwPageCR3;
 
     Assert(!(GCPhysCR3 >> (PAGE_SHIFT + 32)));
-    rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    rc = pgmPoolAlloc(pVM, GCPhysCR3 & GST_CR3_PAGE_MASK, BTH_PGMPOOLKIND_ROOT, SHW_POOL_ROOT_IDX, GCPhysCR3 >> PAGE_SHIFT, &pNewShwPageCR3);
     if (rc == VERR_PGM_POOL_FLUSHED)
     {
         Log(("MapCR3: PGM pool flushed -> signal sync cr3\n"));
-        pVM->pgm.s.CTX_SUFF(pShwPageCR3) = pOldShwPageCR3;
         Assert(VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));
         return VINF_PGM_SYNC_CR3;
@@ -4655 +4655 @@
     AssertRCReturn(rc, rc);
     rc = VINF_SUCCESS;
+
     pVM->pgm.s.iShwUser      = SHW_POOL_ROOT_IDX;
     pVM->pgm.s.iShwUserTable = GCPhysCR3 >> PAGE_SHIFT;
+    pVM->pgm.s.CTX_SUFF(pShwPageCR3) = pNewShwPageCR3;
 #  ifdef IN_RING0
     pVM->pgm.s.pShwPageCR3R3 = MMHyperCCToR3(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
@@ -4682 +4684 @@
     Assert(VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3_NON_GLOBAL));
 #   endif
-    rc = PGMMapActivateAll(pVM);
+    rc = pgmMapActivateCR3(pVM, pNewShwPageCR3);
     AssertRCReturn(rc, rc);
 #  endif
@@ -4783 +4785 @@
 # ifndef PGM_WITHOUT_MAPPINGS
     /* Remove the hypervisor mappings from the shadow page table. */
-    PGMMapDeactivateAll(pVM);
+    pgmMapDeactivateCR3(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 # endif