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

Timestamp:

Sep 10, 2009 1:43:25 PM (15 years ago)

Author:

vboxsync

Message:

VMM: some state stuff (work in progress, back out on bustage).

File:

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

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

@@ -255 +255 @@
     /*
      * Switch to EMT.
-     */
-    va_list va2;
-    va_copy(va2, va); /* Have to make a copy here or GCC will break. */
+     *
+     * If it's a no-wait request, we have to format the message into a buffer
+     * here since the variable arguments list will become invalid once we call
+     * va_end and return.
+     */
     int rc;
     PVMREQ pReq;
@@ -263 +265 @@
         ||  VM_IS_EMT(pVM))
     {
+        fFlags &= ~VMSETRTERR_FLAGS_NO_WAIT;
+
+        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);
+        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)vmR3SetRuntimeErrorV, 5, pVM, fFlags, pszErrorId, pszFormat, &va2);
+                          (PFNRT)vmR3SetRuntimeError, 4, pVM, fFlags, pszErrorId, pszMessage);
+        if (RT_FAILURE(rc))
+            MMR3HeapFree(pszMessage);
+    }
     VMR3ReqFree(pReq);
-    va_end(va2);
 
 #else