Changeset 4521 in vbox for trunk/src/VBox

Timestamp:

Sep 5, 2007 7:39:34 AM (17 years ago)

Author:

vboxsync

Message:

Fixes for taking the address of a va_list parameter. (must make stack copy using va_copy or GCC/AMD64 won't work right.)

Location:

trunk/src/VBox

Files:

• Devices/Audio/audio.c (modified) (1 diff)
• Frontends/VBoxBFE/VBoxBFE.cpp (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• VMM/PDMDevice.cpp (modified) (1 diff)
• VMM/VMMAll/VMAll.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/audio.c

@@ -337 +337 @@
 }
 
-void AUD_vlog (const char *cap, const char *fmt, va_list ap)
-{
+void AUD_vlog (const char *cap, const char *fmt, va_list va)
+{
+    va_list va2;
+    va_copy (va2, va); /* Have to make a copy here or GCC will break. */
     if (cap) {
-        Log (("%s: %N", cap, fmt, &ap));
+        Log (("%s: %N", cap, fmt, &va2));
     }
     else {
-        Log (("%N", fmt, &ap));
-    }
+        Log (("%N", fmt, &va2));
+    }
+    va_end (va2);
 }
 
 void AUD_log (const char *cap, const char *fmt, ...)
 {
-    va_list ap;
-
-    va_start (ap, fmt);
-    AUD_vlog (cap, fmt, ap);
-    va_end (ap);
+    va_list va;
+
+    va_start (va, fmt);
+    AUD_vlog (cap, fmt, va);
+    va_end (va);
 }
 

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

@@ -947 +947 @@
     else
     {
+        va_list va2;
+        va_copy(va2, args); /* Have to make a copy here or GCC will break. */
         RTStrPrintf(szError, sizeof(szError), 
-                    "%N!\nVBox status code: %d (%Vrc)", pszFormat, &args, rc, rc);
+                    "%N!\nVBox status code: %d (%Vrc)", pszFormat, &va2, rc, rc);
         RTPrintf("%s\n", szError);
+        va_end(va2);
     }
 }
@@ -969 +972 @@
                                              const char *pszFormat, va_list args)
 {
-    RTPrintf("%s: %s!\n%N!\n", fFatal ? "Error" : "Warning", pszErrorId, pszFormat, &args);
+    va_list va2;
+    va_copy(va2, args); /* Have to make a copy here or GCC will break. */
+    RTPrintf("%s: %s!\n%N!\n", fFatal ? "Error" : "Warning", pszErrorId, pszFormat, &va2);
+    va_end(va2);
 }
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5404 +5404 @@
 
     /* we ignore RT_SRC_POS_DECL arguments to avoid confusion of end-users */
+    va_list va2;
+    va_copy(va2, args); /* Have to make a copy here or GCC will break. */
     HRESULT hrc = setError (E_FAIL, tr ("%N.\n"
                                         "VBox status code: %d (%Vrc)"),
-                                    tr (pszFormat), &args,
+                                    tr (pszFormat), &va2,
                                     rc, rc);
     task->mProgress->notifyComplete (hrc);
+    va_end(va2);
 }
 

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -2210 +2210 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
+#ifdef LOG_ENABLED
+    va_list va2;
+    va_copy(va2, args);
     LogFlow(("pdmR3DevHlp_DBGFStopV: caller='%s'/%d: pszFile=%p:{%s} iLine=%d pszFunction=%p:{%s} pszFormat=%p:{%s} (%N)\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, pszFile, pszFile, iLine, pszFunction, pszFunction, pszFormat, pszFormat, pszFormat, &args));
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, pszFile, pszFile, iLine, pszFunction, pszFunction, pszFormat, pszFormat, pszFormat, &va2));
+    va_end(va2);
+#endif
 
     PVM pVM = pDevIns->Internal.s.pVMHC;

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

@@ -75 +75 @@
      * Switch to EMT.
      */
+    va_list va2;
+    va_copy(va2, args); /* Have to make a copy here or GCC will break. */
     PVMREQ pReq;
     VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3SetErrorV, 7,  /* ASSUMES 3 source pos args! */
-                pVM, rc, RT_SRC_POS_ARGS, pszFormat, &args);
+                pVM, rc, RT_SRC_POS_ARGS, pszFormat, &va2);
     VMR3ReqFree(pReq);
+    va_end(va2);
 
 #else
@@ -250 +253 @@
      * Switch to EMT.
      */
-    va_list WorkaroundVA;
-    va_copy(WorkaroundVA, args); /* Have to make a copy here or GCC will break. */
+    va_list va2;
+    va_copy(va2, args); /* Have to make a copy here or GCC will break. */
     PVMREQ pReq;
     VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT, (PFNRT)vmR3SetRuntimeErrorV, 5,
-                pVM, fFatal, pszErrorID, pszFormat, &WorkaroundVA);
+                pVM, fFatal, pszErrorID, pszFormat, &va2);
     VMR3ReqFree(pReq);
-    va_end(WorkaroundVA);
+    va_end(va2);
 
 #else