Changeset 20874 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 24, 2009 2:19:29 AM (16 years ago)

Author:

vboxsync

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

49020

Message:

VMMR0CallHost -> VMMRZCallRing3[NoCpu]; VMMCALLHOST -> VMMCALLRING3.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• MMAllHyper.cpp (modified) (1 diff)
• PDMAll.cpp (modified) (1 diff)
• PDMAllCritSect.cpp (modified) (1 diff)
• PDMAllQueue.cpp (modified) (1 diff)
• PGMAll.cpp (modified) (1 diff)
• PGMAllPhys.cpp (modified) (3 diffs)
• PGMAllPool.cpp (modified) (1 diff)
• REMAll.cpp (modified) (2 diffs)
• VMAll.cpp (modified) (2 diffs)

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

@@ -171 +171 @@
 #if defined(IN_RC) || defined(IN_RING0)
     if (rc == VERR_SEM_BUSY)
-        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_MMHYPER_LOCK, 0);
+        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_MMHYPER_LOCK, 0);
 #endif
     AssertRC(rc);

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

@@ -328 +328 @@
     int rc = PDMCritSectEnter(&pVM->pdm.s.CritSect, VERR_GENERAL_FAILURE);
     if (rc == VERR_GENERAL_FAILURE)
-        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PDM_LOCK, 0);
+        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PDM_LOCK, 0);
 #endif
     AssertRC(rc);

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

@@ -284 +284 @@
  *
  * @param   pCritSect           The PDM critical section to enter.
- * @param   fCallHost           Whether this is a VMMGCCallHost() or VMMR0CallHost() request.
- */
-VMMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost)
+ * @param   fCallRing3          Whether this is a VMMRZCallRing3()request.
+ */
+VMMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3)
 {
     int rc = PDMCritSectEnter(pCritSect, VERR_INTERNAL_ERROR);
     if (    rc == VINF_SUCCESS
-        &&  fCallHost
+        &&  fCallRing3
         &&  pCritSect->s.Core.Strict.ThreadOwner != NIL_RTTHREAD)
     {

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

@@ -183 +183 @@
     Assert(pQueue->CTX_SUFF(pVM));
     pVM->pdm.s.CTX_SUFF(pQueueFlush) = pQueue;
-    VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
+    VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
 
 #else /* IN_RING3: */

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

@@ -2079 +2079 @@
 #if defined(IN_RC) || defined(IN_RING0)
     if (rc == VERR_SEM_BUSY)
-        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PGM_LOCK, 0);
+        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_LOCK, 0);
 #endif
     AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));

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

@@ -272 +272 @@
             int rc = PGMR3PhysAllocateHandyPages(pVM);
 #else
-            int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
+            int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_ALLOCATE_HANDY_PAGES, 0);
 #endif
             if (RT_UNLIKELY(rc != VINF_SUCCESS))
@@ -550 +550 @@
         {
 # ifdef IN_RING0
-            int rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_MAP_CHUNK, idChunk);
+            int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_MAP_CHUNK, idChunk);
             AssertRCReturn(rc, rc);
             pMap = (PPGMCHUNKR3MAP)RTAvlU32Get(&pVM->pgm.s.ChunkR3Map.pTree, idChunk);
@@ -668 +668 @@
         {
 #ifdef IN_RING0
-            int rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_MAP_CHUNK, idChunk);
+            int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_MAP_CHUNK, idChunk);
             AssertRCReturn(rc, rc);
             pMap = (PPGMCHUNKR3MAP)RTAvlU32Get(&pVM->pgm.s.ChunkR3Map.pTree, idChunk);

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

@@ -4009 +4009 @@
         int rc = PGMR3PoolGrow(pVM);
 #else
-        int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PGM_POOL_GROW, 0);
+        int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_PGM_POOL_GROW, 0);
 #endif
         if (RT_FAILURE(rc))

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

@@ -102 +102 @@
                 Assert(cFlushes++ != 128);
                 AssertFatal(cFlushes < _1M);
-                VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
+                VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
                 idxFree = ASMAtomicUoReadU32(&pVM->rem.s.idxFreeList);
             } while (idxFree == (uint32_t)-1);
@@ -227 +227 @@
 
     /* Ok, we gotta flush them. */
-    VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
+    VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
 }
 #endif /* IN_RC */

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

@@ -96 +96 @@
      */
     vmSetErrorCopy(pVM, rc, RT_SRC_POS_ARGS, pszFormat, args);
-    VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_VM_SET_ERROR, 0);
+    VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_VM_SET_ERROR, 0);
 #endif
     return rc;
@@ -281 +281 @@
     vmSetRuntimeErrorCopy(pVM, fFlags, pszErrorId, pszFormat, va);
 
-    int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_VM_SET_RUNTIME_ERROR, 0);
+    int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_VM_SET_RUNTIME_ERROR, 0);
 #endif