Changeset 23011 in vbox for trunk/src/VBox/VMM/VM.cpp

Timestamp:

Sep 14, 2009 3:57:38 PM (15 years ago)

Author:

vboxsync

Message:

VMM,VMMDev: Some VMMR3ReqCall refactoring.

File:

• trunk/src/VBox/VMM/VM.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -764 +764 @@
     for (VMCPUID idCpu = 1; idCpu < pVM->cCpus; idCpu++)
     {
-        PVMREQ pReq;
-        rc = VMR3ReqCallU(pUVM, idCpu, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3RegisterEMT, 2, pVM, idCpu);
-        if (RT_SUCCESS(rc))
-            rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
+        rc = VMR3ReqCallWaitU(pUVM, idCpu, (PFNRT)vmR3RegisterEMT, 2, pVM, idCpu);
         if (RT_FAILURE(rc))
             return rc;
@@ -1196 +1191 @@
      * work upfront).
      */
-    PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ALL, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3PowerOn, 1, pVM);
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, VMCPUID_ALL, (PFNRT)vmR3PowerOn, 1, pVM);
     LogFlow(("VMR3PowerOn: returns %Rrc\n", rc));
     return rc;
@@ -1289 +1276 @@
      * actual suspending after the other ones have stopped running guest code.
      */
-    PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3Suspend, 2, pVM, fFatal);
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
-    return rc;
+    return VMR3ReqCallWaitU(pVM->pUVM, VMCPUID_ALL_REVERSE, (PFNRT)vmR3Suspend, 2, pVM, fFatal);
 }
 
@@ -1387 +1365 @@
      * work upfront).
      */
-    PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ALL, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3Resume, 1, pVM);
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, VMCPUID_ALL, (PFNRT)vmR3Resume, 1, pVM);
     LogFlow(("VMR3Resume: returns %Rrc\n", rc));
     return rc;
@@ -1513 +1483 @@
     SSMAFTER    enmAfter = fContinueAfterwards ? SSMAFTER_CONTINUE : SSMAFTER_DESTROY;
     PSSMHANDLE  pSSM;
-    PVMREQ      pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, 0 /*idDstCpu*/, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3Save, 6, pVM, pszFilename, enmAfter, pfnProgress, pvUser, &pSSM);
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/,
+                              (PFNRT)vmR3Save, 6, pVM, pszFilename, enmAfter, pfnProgress, pvUser, &pSSM);
     if (    RT_SUCCESS(rc)
         &&  pSSM)
@@ -1533 +1497 @@
             rc = vmR3SuspendCommon(pVM, false /*fFatal*/);
             if (RT_SUCCESS(rc))
-            {
-                rc = VMR3ReqCallU(pVM->pUVM, 0 /*idDstCpu*/, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                                  (PFNRT)vmR3SaveLiveStep2, 2, pVM, pSSM);
-                if (RT_SUCCESS(rc))
-                {
-                    rc = pReq->iStatus;
-                    VMR3ReqFree(pReq);
-                }
-            }
+                rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3SaveLiveStep2, 2, pVM, pSSM);
         }
         else
@@ -1677 +1633 @@
      * Request the operation in EMT.
      */
-    PVMREQ pReq;
-    int rc = VMR3ReqCallU(pVM->pUVM, 0 /*idDstCpu*/, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3Load, 4, pVM, pszFilename, pfnProgress, pvUser);
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/,
+                              (PFNRT)vmR3Load, 4, pVM, pszFilename, pfnProgress, pvUser);
     LogFlow(("VMR3Load: returns %Rrc\n", rc));
     return rc;
@@ -1859 +1808 @@
      * Request the operation in EMT. (in reverse order as VCPU 0 does the actual work)
      */
-    PVMREQ pReq = NULL;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3PowerOff, 1, pVM);
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-    else
-        Assert(pReq == NULL);
-
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, VMCPUID_ALL_REVERSE, (PFNRT)vmR3PowerOff, 1, pVM);
     LogFlow(("VMR3PowerOff: returns %Rrc\n", rc));
     return rc;
@@ -1944 +1883 @@
         for (VMCPUID idCpu = 1; idCpu < pVM->cCpus; idCpu++)
         {
-            PVMREQ pReq = NULL;
-            int rc = VMR3ReqCallU(pUVM, idCpu, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                                  (PFNRT)vmR3Destroy, 1, pVM);
-            if (RT_SUCCESS(rc))
-                rc = pReq->iStatus;
+            int rc = VMR3ReqCallWaitU(pUVM, idCpu, (PFNRT)vmR3Destroy, 1, pVM);
             AssertLogRelRC(rc);
-            VMR3ReqFree(pReq);
         }
     }
@@ -1956 +1890 @@
     {
         /* vmR3Destroy on all EMTs, ending with EMT(0). */
-        PVMREQ pReq = NULL;
-        int rc = VMR3ReqCallU(pUVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                              (PFNRT)vmR3Destroy, 1, pVM);
-        if (RT_SUCCESS(rc))
-            rc = pReq->iStatus;
+        int rc = VMR3ReqCallWaitU(pUVM, VMCPUID_ALL_REVERSE, (PFNRT)vmR3Destroy, 1, pVM);
         AssertLogRelRC(rc);
-        VMR3ReqFree(pReq);
 
         /* Wait for EMTs and destroy the UVM. */
@@ -2536 +2465 @@
      * and wait for it to be processed. (in reverse order as VCPU 0 does the real cleanup)
      */
-    PVMREQ pReq = NULL;
-    int rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ALL_REVERSE, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3Reset, 1, pVM);
-    if (RT_SUCCESS(rc))
-        rc = pReq->iStatus;
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, VMCPUID_ALL_REVERSE, (PFNRT)vmR3Reset, 1, pVM);
     AssertLogRelRC(rc);
-    VMR3ReqFree(pReq);
-
     return rc;
 }