Changeset 23021 in vbox for trunk/src

Timestamp:

Sep 15, 2009 7:03:49 AM (15 years ago)

Author:

vboxsync

Message:

VBoxBFE: VMR3ReqCall w/ RT_INDEFINITE_WAIT -> VMR3ReqCallWait

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• HostUSBImpl.cpp (modified) (2 diffs)
• MachineDebuggerImpl.cpp (modified) (2 diffs)
• VBoxBFE.cpp (modified) (4 diffs)
• VMControl.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.cpp

@@ -243 +243 @@
 
     LogFlowMember (("Console::AttachUSBDevice: Proxying USB device '%s' %RTuuid...\n", Address.c_str(), &Uuid));
-    PVMREQ pReq;
-    vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
+    vrc = VMR3ReqCallWait (mpVM, VMCPUID_ANY,
                        (PFNRT)pRhConfig->pfnCreateProxyDevice,
                        5, pRhConfig, &Uuid, fRemote,
                        Address.c_str(), pvRemote);
-    if (RT_SUCCESS (vrc))
-        vrc = pReq->iStatus;
-    VMR3ReqFree (pReq);
     if (RT_SUCCESS (vrc))
         hostDevice->setCaptured();
@@ -302 +298 @@
             RTUUID Uuid = aDevice->id();
             LogFlowMember (("Console::DetachUSBDevice: Detaching USB proxy device %RTuuid...\n", &Uuid));
-            PVMREQ pReq;
-            vrc = VMR3ReqCall (mpVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)pRhConfig->pfnDestroyProxyDevice,
+            vrc = VMR3ReqCallWait (mpVM, VMCPUID_ANY, (PFNRT)pRhConfig->pfnDestroyProxyDevice,
                                2, pRhConfig, &Uuid);
-            if (RT_SUCCESS (vrc))
-                vrc = pReq->iStatus;
-            VMR3ReqFree (pReq);
         }
     }

trunk/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp

@@ -136 +136 @@
     }
 
-    PVMREQ pReq;
     EMRAWMODE rawModeFlag = enable ? EMRAW_RING3_DISABLE : EMRAW_RING3_ENABLE;
-    int rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                             (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag);
-    if (RT_SUCCESS(rcVBox))
-    {
-        rcVBox = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
+    int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag);
     if (RT_SUCCESS(rcVBox))
         return S_OK;
@@ -196 +188 @@
     }
 
-    PVMREQ pReq;
     EMRAWMODE rawModeFlag = enable ? EMRAW_RING0_DISABLE : EMRAW_RING0_ENABLE;
-    int rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                             (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag);
-    if (RT_SUCCESS(rcVBox))
-    {
-        rcVBox = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
+    int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag);
     if (RT_SUCCESS(rcVBox))
         return S_OK;

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -965 +965 @@
         {
             /* Power off VM */
-            PVMREQ pReq;
-            rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)VMR3PowerOff, 1, pVM);
+            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3PowerOff, 1, pVM);
+            AssertRC(rc);
         }
 
@@ -1270 +1270 @@
     if (RT_SUCCESS(rc))
     {
-        PVMREQ pReq;
-
         if (   g_fRestoreState
             && g_pszStateFile
@@ -1278 +1276 @@
         {
             startProgressInfo("Restoring");
-            rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
+            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY,
                              (PFNRT)VMR3Load, 4, pVM, g_pszStateFile, &callProgressInfo, (uintptr_t)NULL);
             endProgressInfo();
             if (RT_SUCCESS(rc))
             {
-                VMR3ReqFree(pReq);
-                rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                                 (PFNRT)VMR3Resume, 1, pVM);
-                if (RT_SUCCESS(rc))
-                {
-                    rc = pReq->iStatus;
-                    VMR3ReqFree(pReq);
-                }
+                rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3Resume, 1, pVM);
+                AssertRC(rc);
                 gDisplay->setRunning();
             }
@@ -1298 +1290 @@
         else
         {
-            rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)VMR3PowerOn, 1, pVM);
-            if (RT_SUCCESS(rc))
-            {
-                rc = pReq->iStatus;
-                AssertRC(rc);
-                VMR3ReqFree(pReq);
-            }
-            else
+            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3PowerOn, 1, pVM);
+            if (RT_FAILURE(rc))
                 AssertMsgFailed(("VMR3PowerOn failed, rc=%Rrc\n", rc));
         }

trunk/src/VBox/Frontends/VBoxBFE/VMControl.cpp

@@ -62 +62 @@
         gConsole->inputGrabEnd();
 
-    PVMREQ pReq;
-    int rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                             (PFNRT)VMR3Suspend, 1, pVM);
+    int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3Suspend, 1, pVM);
     AssertRC(rcVBox);
-    if (RT_SUCCESS(rcVBox))
-    {
-        rcVBox = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
     return VINF_SUCCESS;
 }
@@ -83 +76 @@
         return VERR_VM_INVALID_VM_STATE;
 
-    PVMREQ pReq;
-    int rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                             (PFNRT)VMR3Resume, 1, pVM);
+    int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3Resume, 1, pVM);
     AssertRC(rcVBox);
-    if (RT_SUCCESS(rcVBox))
-    {
-        rcVBox = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
     return VINF_SUCCESS;
 }
@@ -101 +87 @@
 VMCtrlReset(void)
 {
-    PVMREQ pReq;
-    int rcVBox = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                             (PFNRT)VMR3Reset, 1, pVM);
+    int rcVBox = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3Reset, 1, pVM);
     AssertRC(rcVBox);
-    if (RT_SUCCESS(rcVBox))
-    {
-        rcVBox = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
-
     return VINF_SUCCESS;
 }
@@ -155 +133 @@
 DECLCALLBACK(int) VMSaveThread(RTTHREAD Thread, void *pvUser)
 {
-    PVMREQ pReq;
     void (*pfnQuit)(void) = (void(*)(void))pvUser;
     int rc;
 
     startProgressInfo("Saving");
-    rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                     (PFNRT)VMR3Save, 5, pVM, g_pszStateFile, false /*fContinueAftewards*/, &callProgressInfo, (uintptr_t)NULL);
+    rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, 
+                         (PFNRT)VMR3Save, 5, pVM, g_pszStateFile, false /*fContinueAftewards*/, &callProgressInfo, (uintptr_t)NULL);
+    AssertRC(rc);
     endProgressInfo();
-    if (RT_SUCCESS(rc))
-    {
-        rc = pReq->iStatus;
-        VMR3ReqFree(pReq);
-    }
     pfnQuit();
 
-    return 0;
+    return VINF_SUCCESS;
 }
 
@@ -192 +165 @@
     if (machineState == VMSTATE_RUNNING)
     {
-        PVMREQ pReq;
-        rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                         (PFNRT)VMR3Suspend, 1, pVM);
+        rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3Suspend, 1, pVM);
         AssertRC(rc);
-        if (RT_SUCCESS(rc))
-        {
-            rc = pReq->iStatus;
-            VMR3ReqFree(pReq);
-        }
     }