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

Timestamp:

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

Author:

vboxsync

Message:

VMM,VMMDev: Some VMMR3ReqCall refactoring.

File:

• trunk/src/VBox/VMM/VMMAll/VMAll.cpp (modified) (2 diffs)

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

@@ -261 +261 @@
      */
     int rc;
-    PVMREQ pReq;
     if (    !(fFlags & VMSETRTERR_FLAGS_NO_WAIT)
         ||  VM_IS_EMT(pVM))
@@ -269 +268 @@
         va_list va2;
         va_copy(va2, va); /* Have to make a copy here or GCC will break. */
-        rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, VMREQFLAGS_VBOX_STATUS,
-                          (PFNRT)vmR3SetRuntimeErrorV, 5, pVM, fFlags, pszErrorId, pszFormat, &va2);
+        rc = VMR3ReqCallWaitU(pVM->pUVM, VMCPUID_ANY,
+                              (PFNRT)vmR3SetRuntimeErrorV, 5, pVM, fFlags, pszErrorId, pszFormat, &va2);
         va_end(va2);
-        if (RT_SUCCESS(rc))
-            rc = pReq->iStatus;
     }
     else
     {
         char *pszMessage = MMR3HeapAPrintfV(pVM, MM_TAG_VM, pszFormat, va);
-
-        rc = VMR3ReqCallU(pVM->pUVM, VMCPUID_ANY, &pReq, 0, VMREQFLAGS_VBOX_STATUS | VMREQFLAGS_NO_WAIT,
-                          (PFNRT)vmR3SetRuntimeError, 4, pVM, fFlags, pszErrorId, pszMessage);
+        rc = VMR3ReqCallNoWaitU(pVM->pUVM, VMCPUID_ANY,
+                                (PFNRT)vmR3SetRuntimeError, 4, pVM, fFlags, pszErrorId, pszMessage);
         if (RT_FAILURE(rc))
             MMR3HeapFree(pszMessage);
     }
-    VMR3ReqFree(pReq);
 
 #else