Changeset 13060 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Oct 8, 2008 7:42:06 AM (16 years ago)

Author:

vboxsync

Message:

#1865: More PGM changes.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (9 diffs)

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

@@ -486 +486 @@
             }
 # elif PGM_GST_TYPE == PGM_TYPE_AMD64
-            PPGMPOOL pPool = pVM->pgm.s.CTXSUFF(pPool);
+            PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
 
             pVM->pgm.s.pGstPaePML4HC = (R3R0PTRTYPE(PX86PML4))HCPtrGuestCR3;
@@ -564 +564 @@
         if (pVM->pgm.s.pHCShwAmd64CR3)
         {
-            PPGMPOOL pPool = pVM->pgm.s.CTXSUFF(pPool);
+            PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
             pgmPoolFreeByPage(pPool, pVM->pgm.s.pHCShwAmd64CR3, PGMPOOL_IDX_AMD64_CR3, pVM->pgm.s.pHCShwAmd64CR3->GCPhys >> PAGE_SHIFT);
             pVM->pgm.s.pHCShwAmd64CR3 = NULL;
@@ -614 +614 @@
                                               pVM->pgm.s.pszR3GstWriteHandlerCR3);
 # else  /* PGMPOOL_WITH_MIXED_PT_CR3 */
-        rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTXSUFF(pPool),
+        rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTX_SUFF(pPool),
                                          pVM->pgm.s.enmShadowMode == PGMMODE_PAE
                                       || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX
@@ -640 +640 @@
     if (pVM->pgm.s.GCPhysGstCR3Monitored != GCPhysCR3)
     {
-        rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PDPT, GCPhysCR3);
+        rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTX_SUFF(pPool), PGMPOOL_IDX_PDPT, GCPhysCR3);
         if (VBOX_FAILURE(rc))
         {
@@ -661 +661 @@
                 Assert(pVM->pgm.s.enmShadowMode == PGMMODE_PAE || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX);
 
-                rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PAE_PD_0 + i, GCPhys);
+                rc = pgmPoolMonitorMonitorCR3(pVM->pgm.s.CTX_SUFF(pPool), PGMPOOL_IDX_PAE_PD_0 + i, GCPhys);
             }
 
@@ -674 +674 @@
         else if (pVM->pgm.s.aGCPhysGstPaePDsMonitored[i] != NIL_RTGCPHYS)
         {
-            rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PAE_PD_0 + i);
+            rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTX_SUFF(pPool), PGMPOOL_IDX_PAE_PD_0 + i);
             AssertRC(rc);
             pVM->pgm.s.aGCPhysGstPaePDsMonitored[i] = NIL_RTGCPHYS;
@@ -710 +710 @@
         AssertRCReturn(rc, rc);
 # else /* PGMPOOL_WITH_MIXED_PT_CR3 */
-        rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool),
+        rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTX_SUFF(pPool),
                                            pVM->pgm.s.enmShadowMode == PGMMODE_PAE
                                         || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX
@@ -728 +728 @@
     if (pVM->pgm.s.GCPhysGstCR3Monitored != NIL_RTGCPHYS)
     {
-        rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PDPT);
+        rc = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTX_SUFF(pPool), PGMPOOL_IDX_PDPT);
         AssertRC(rc);
     }
@@ -738 +738 @@
         {
             Assert(pVM->pgm.s.enmShadowMode == PGMMODE_PAE || pVM->pgm.s.enmShadowMode == PGMMODE_PAE_NX);
-            int rc2 = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTXSUFF(pPool), PGMPOOL_IDX_PAE_PD_0 + i);
+            int rc2 = pgmPoolMonitorUnmonitorCR3(pVM->pgm.s.CTX_SUFF(pPool), PGMPOOL_IDX_PAE_PD_0 + i);
             AssertRC(rc2);
             if (VBOX_FAILURE(rc2))