Changeset 20873 in vbox

Timestamp:

Jun 24, 2009 2:08:38 AM (16 years ago)

Author:

vboxsync

Message:

VMMGCCallHost -> VMMRZCallRing3[NoCpu].

Location:

trunk

Files:

• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/MMAllHyper.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PDMAllQueue.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/VMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMGC/VMMGC.cpp (modified) (3 diffs)

trunk/include/VBox/vmm.h

@@ -371 +371 @@
 VMMRCDECL(int)      VMMGCEntry(PVM pVM, unsigned uOperation, unsigned uArg, ...);
 VMMRCDECL(void)     VMMGCGuestToHost(PVM pVM, int rc);
-VMMRCDECL(int)      VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg);
 VMMRCDECL(void)     VMMGCLogFlushIfFull(PVM pVM);
 /** @} */

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

@@ -169 +169 @@
 #endif
     int rc = PDMCritSectEnter(&pHeap->Lock, VERR_SEM_BUSY);
-#ifdef IN_RC
+#if defined(IN_RC) || defined(IN_RING0)
     if (rc == VERR_SEM_BUSY)
-        rc = VMMGCCallHost(pVM, VMMCALLHOST_MMHYPER_LOCK, 0);
-#elif defined(IN_RING0)
-    if (rc == VERR_SEM_BUSY)
-        rc = VMMR0CallHost(pVM, VMMCALLHOST_MMHYPER_LOCK, 0);
+        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_MMHYPER_LOCK, 0);
 #endif
     AssertRC(rc);

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

@@ -259 +259 @@
         Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnGetTPR));
         /* We don't acquire the PDM lock here as we're just reading information. Doing so causes massive
-         * contention as this function is called very often by each and every VCPU. 
+         * contention as this function is called very often by each and every VCPU.
          */
         *pu8TPR = pVM->pdm.s.Apic.CTX_SUFF(pfnGetTPR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), pVCpu->idCpu);
@@ -328 +328 @@
     int rc = PDMCritSectEnter(&pVM->pdm.s.CritSect, VERR_GENERAL_FAILURE);
     if (rc == VERR_GENERAL_FAILURE)
-    {
-# ifdef IN_RC
-        rc = VMMGCCallHost(pVM, VMMCALLHOST_PDM_LOCK, 0);
-# else
-        rc = VMMR0CallHost(pVM, VMMCALLHOST_PDM_LOCK, 0);
-# endif
-    }
+        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PDM_LOCK, 0);
 #endif
     AssertRC(rc);

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

@@ -180 +180 @@
     PVM pVM = pQueue->CTX_SUFF(pVM);
 
-#ifdef IN_RC
-    Assert(pQueue->pVMRC);
+#if defined(IN_RC) || defined(IN_RING0)
+    Assert(pQueue->CTX_SUFF(pVM));
     pVM->pdm.s.CTX_SUFF(pQueueFlush) = pQueue;
-    VMMGCCallHost(pVM, VMMCALLHOST_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
-
-#elif defined(IN_RING0)
-    Assert(pQueue->pVMR0);
-    pVM->pdm.s.CTX_SUFF(pQueueFlush) = pQueue;
-    VMMR0CallHost(pVM, VMMCALLHOST_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
+    VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
 
 #else /* IN_RING3: */

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

@@ -2077 +2077 @@
 {
     int rc = PDMCritSectEnter(&pVM->pgm.s.CritSect, VERR_SEM_BUSY);
-#ifdef IN_RC
+#if defined(IN_RC) || defined(IN_RING0)
     if (rc == VERR_SEM_BUSY)
-        rc = VMMGCCallHost(pVM, VMMCALLHOST_PGM_LOCK, 0);
-#elif defined(IN_RING0)
-    if (rc == VERR_SEM_BUSY)
-        rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_LOCK, 0);
+        rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PGM_LOCK, 0);
 #endif
     AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));

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

@@ -271 +271 @@
 #ifdef IN_RING3
             int rc = PGMR3PhysAllocateHandyPages(pVM);
-#elif defined(IN_RING0)
-            int rc = VMMR0CallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
 #else
-            int rc = VMMGCCallHost(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
+            int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES, 0);
 #endif
             if (RT_UNLIKELY(rc != VINF_SUCCESS))

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

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

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

@@ -96 +96 @@
      */
     vmSetErrorCopy(pVM, rc, RT_SRC_POS_ARGS, pszFormat, args);
-
-# ifdef IN_RC
-    VMMGCCallHost(pVM, VMMCALLHOST_VM_SET_ERROR, 0);
-# elif defined(IN_RING0)
-    VMMR0CallHost(pVM, VMMCALLHOST_VM_SET_ERROR, 0);
-# else
-# endif
+    VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_VM_SET_ERROR, 0);
 #endif
     return rc;
@@ -287 +281 @@
     vmSetRuntimeErrorCopy(pVM, fFlags, pszErrorId, pszFormat, va);
 
-# ifdef IN_RC
-    int rc = VMMGCCallHost(pVM, VMMCALLHOST_VM_SET_RUNTIME_ERROR, 0);
-# else
-    int rc = VMMR0CallHost(pVM, VMMCALLHOST_VM_SET_RUNTIME_ERROR, 0);
-# endif
+    int rc = VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_VM_SET_RUNTIME_ERROR, 0);
 #endif
 

trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

@@ -176 +176 @@
     PVM pVM = &g_VM;
     NOREF(pLogger);
-    return VMMGCCallHost(pVM, VMMCALLHOST_VMM_LOGGER_FLUSH, 0);
+    if (pVM->vmm.s.fRCLoggerFlushingDisabled)
+        return VINF_SUCCESS; /* fail quietly. */
+    return VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_VMM_LOGGER_FLUSH, 0);
 }
 
@@ -192 +194 @@
         if (pVM->vmm.s.fRCLoggerFlushingDisabled)
             return; /* fail quietly. */
-        VMMGCCallHost(pVM, VMMCALLHOST_VMM_LOGGER_FLUSH, 0);
+        VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_VMM_LOGGER_FLUSH, 0);
     }
 }
@@ -206 +208 @@
 {
     pVM->vmm.s.pfnGuestToHostRC(rc);
-}
-
-
-/**
- * Calls the ring-3 host code.
- *
- * @returns VBox status code of the ring-3 call.
- * @param   pVM             The VM handle.
- * @param   enmOperation    The operation.
- * @param   uArg            The argument to the operation.
- *
- * @deprecated Use VMMRZCallRing3.
- */
-VMMRCDECL(int) VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
-{
-    return VMMRZCallRing3(pVM, VMMGetCpu0(pVM), enmOperation, uArg);
 }