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

Timestamp:

Apr 17, 2009 7:22:59 AM (16 years ago)

Author:

vboxsync

Message:

Mac build fixes

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (8 diffs)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

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

@@ -978 +978 @@
     {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-        uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
+        uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVM);
         pgmPoolMonitorChainChanging(pVCpu, pPool, pPage, GCPhysFault, (RTGCPTR)pu32, NULL);
-        PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+        PGMDynMapPopAutoSubset(pVM, iPrevSubset);
 #else
         pgmPoolMonitorChainChanging(pVCpu, pPool, pPage, GCPhysFault, (RTGCPTR)pu32, NULL);
@@ -1034 +1034 @@
      */
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    uint32_t    iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
+    uint32_t    iPrevSubset = PGMDynMapPushAutoSubset(pVM);
     pgmPoolMonitorChainChanging(pVCpu, pPool, pPage, GCPhysFault, pvFault, pCpu);
-    PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+    PGMDynMapPopAutoSubset(pVM, iPrevSubset);
 #else
     pgmPoolMonitorChainChanging(pVCpu, pPool, pPage, GCPhysFault, pvFault, pCpu);
@@ -2668 +2668 @@
                pgmPoolTrackFlushGCPhysPTs will/may kill the pool otherwise. */
             PVMCPU pVCpu = VMMGetCpu(pVM);
-            uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
+            uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVM);
 # endif
 
@@ -2683 +2683 @@
 
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-            PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+            PGMDynMapPopAutoSubset(pVM, iPrevSubset);
 # endif
         }
@@ -2696 +2696 @@
         /* Start a subset here because pgmPoolTrackFlushGCPhysPTsSlow kill the pool otherwise. */
         PVMCPU pVCpu = VMMGetCpu(pVM);
-        uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
+        uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVM);
 # endif
         rc = pgmPoolTrackFlushGCPhysPTsSlow(pVM, pPhysPage);
@@ -2704 +2704 @@
 
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+    PGMDynMapPopAutoSubset(pVM, iPrevSubset);
 # endif
 
@@ -4038 +4038 @@
     /* Start a subset so we won't run out of mapping space. */
     PVMCPU pVCpu = VMMGetCpu(pPool->CTX_SUFF(pVM));
-    uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVCpu);
+    uint32_t iPrevSubset = PGMDynMapPushAutoSubset(pVM);
 #endif
 
@@ -4065 +4065 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     /* Heavy stuff done. */
-    PGMDynMapPopAutoSubset(pVCpu, iPrevSubset);
+    PGMDynMapPopAutoSubset(pVM, iPrevSubset);
 #endif
 

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -2136 +2136 @@
 #endif
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    PGMDynMapFlushAutoSet(pVCpu);
+    PGMDynMapFlushAutoSet(pVM);
 #endif