Changeset 4520 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

Don't take the address of a va_list parameter. must va_copy it first or GCC/AMD64 won't work.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/VMAll.cpp (modified) (1 diff)
• testcase/tstVMREQ.cpp (modified) (9 diffs)

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

@@ -250 +250 @@
      * Switch to EMT.
      */
+    va_list WorkaroundVA;
+    va_copy(WorkaroundVA, 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, &args);
+                pVM, fFatal, pszErrorID, pszFormat, &WorkaroundVA);
     VMR3ReqFree(pReq);
+    va_end(WorkaroundVA);
 
 #else

trunk/src/VBox/VMM/testcase/tstVMREQ.cpp

@@ -33 +33 @@
 
 
-
-
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
@@ -40 +38 @@
 #define TESTCASE    "tstVMREQ"
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** the error count. */
+static int g_cErrors = 0;
+
+
+/** 
+ * Testings va_list passing in VMSetRuntimeError.
+ */
+static DECLCALLBACK(void) MyAtRuntimeError(PVM pVM, void *pvUser, bool fFatal, const char *pszErrorId, const char *pszFormat, va_list va)
+{
+    if (strcmp((const char *)pvUser, "user argument"))
+    {
+        RTPrintf(TESTCASE ": pvUser=%p:{%s}!\n", pvUser, (const char *)pvUser);
+        g_cErrors++;
+    }
+    if (fFatal)
+    {
+        RTPrintf(TESTCASE ": fFatal=%d!\n", fFatal);
+        g_cErrors++;
+    }
+    if (strcmp(pszErrorId, "enum"))
+    {
+        RTPrintf(TESTCASE ": pszErrorId=%p:{%s}!\n", pszErrorId, pszErrorId);
+        g_cErrors++;
+    }
+    if (strcmp(pszFormat, "some %s string"))
+    {
+        RTPrintf(TESTCASE ": pszFormat=%p:{%s}!\n", pszFormat, pszFormat);
+        g_cErrors++;
+    }
+
+    char szBuf[1024];
+    RTStrPrintfV(szBuf, sizeof(szBuf), pszFormat, va);
+    if (strcmp(szBuf, "some error string"))
+    {
+        RTPrintf(TESTCASE ": RTStrPrintfV -> '%s'!\n", szBuf);
+        g_cErrors++;
+    }
+}
+
+
+/**
+ * The function PassVA and PassVA2 calls.
+ */
+static DECLCALLBACK(int) PassVACallback(PVM pVM, unsigned u4K, unsigned u1G, const char *pszFormat, va_list *pva)
+{
+    if (u4K != _4K)
+    {
+        RTPrintf(TESTCASE ": u4K=%#x!\n", u4K);
+        g_cErrors++;
+    }
+    if (u1G != _1G)
+    {
+        RTPrintf(TESTCASE ": u1G=%#x!\n", u1G);
+        g_cErrors++;
+    }
+
+    if (strcmp(pszFormat, "hello %s"))
+    {
+        RTPrintf(TESTCASE ": pszFormat=%p:{%s}!\n", pszFormat, pszFormat);
+        g_cErrors++;
+    }
+
+    char szBuf[1024];
+    RTStrPrintfV(szBuf, sizeof(szBuf), pszFormat, *pva);
+    if (strcmp(szBuf, "hello world"))
+    {
+        RTPrintf(TESTCASE ": RTStrPrintfV -> '%s'!\n", szBuf);
+        g_cErrors++;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/** 
+ * Functions that tests passing a va_list * argument in a request, 
+ * similar to VMSetRuntimeError.
+ */
+static void PassVA2(PVM pVM, const char *pszFormat, va_list va)
+{
+#if 0 /** @todo test if this is a GCC problem only or also happens with AMD64+VCC80... */
+    void *pvVA = &va;
+#else
+    va_list va2;
+    va_copy(va2, va); 
+    void *pvVA = va2;
+#endif 
+
+    PVMREQ pReq;
+    int rc = VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PassVACallback, 5,
+                         pVM, _4K, _1G, pszFormat, pvVA);
+    if (VBOX_SUCCESS(rc))
+        rc = pReq->iStatus;
+    VMR3ReqFree(pReq);
+
+#if 1
+    va_end(va2);
+#endif 
+}
+
+
+/** 
+ * Functions that tests passing a va_list * argument in a request, 
+ * similar to VMSetRuntimeError.
+ */
+static void PassVA(PVM pVM, const char *pszFormat, ...)
+{
+    /* 1st test */
+    va_list va1;
+    va_start(va1, pszFormat);
+    PVMREQ pReq;
+    int rc = VMR3ReqCall(pVM, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PassVACallback, 5,
+                         pVM, _4K, _1G, pszFormat, &va1);
+    if (VBOX_SUCCESS(rc))
+        rc = pReq->iStatus;
+    VMR3ReqFree(pReq);
+    va_end(va1);
+
+    /* 2nd test */
+    va_list va2;
+    va_start(va2, pszFormat);
+    PassVA2(pVM, pszFormat, va2);
+    va_end(va2);
+}
+
+
 /**
  * Thread function which allocates and frees requests like wildfire.
  */
-DECLCALLBACK(int) Thread(RTTHREAD Thread, void *pvUser)
+static DECLCALLBACK(int) Thread(RTTHREAD Thread, void *pvUser)
 {
     int rc = VINF_SUCCESS;
@@ -88 +215 @@
 int main(int argc, char **argv)
 {
-    int     cErrors = 0;
-
     RTR3Init();
     RTPrintf(TESTCASE ": TESTING...\n");
@@ -117 +242 @@
                 {
                     RTPrintf(TESTCASE ": RTThreadWait(Thread1,,) failed, rc=%Vrc\n", rc);
-                    cErrors++;
+                    g_cErrors++;
                 }
                 if (VBOX_FAILURE(rcThread1))
-                    cErrors++;
+                    g_cErrors++;
             }
             else
             {
                 RTPrintf(TESTCASE ": RTThreadCreate(&Thread1,,,,) failed, rc=%Vrc\n", rc);
-                cErrors++;
+                g_cErrors++;
             }
 
@@ -133 +258 @@
             {
                 RTPrintf(TESTCASE ": RTThreadWait(Thread1,,) failed, rc=%Vrc\n", rc);
-                cErrors++;
+                g_cErrors++;
             }
             if (VBOX_FAILURE(rcThread0))
-                cErrors++;
+                g_cErrors++;
         }
         else
         {
             RTPrintf(TESTCASE ": RTThreadCreate(&Thread0,,,,) failed, rc=%Vrc\n", rc);
-            cErrors++;
+            g_cErrors++;
         }
         uint64_t u64ElapsedTS = RTTimeNanoTS() - u64StartTS;
@@ -150 +275 @@
          */
         STAMR3Print(pVM, "/VM/Req/*");
+
+        /*
+         * Testing va_list fun.
+         */
+        RTPrintf(TESTCASE ": va_list argument test...\n");
+        PassVA(pVM, "hello %s", "world");
+        VMR3AtRuntimeErrorRegister(pVM, MyAtRuntimeError, (void *)"user argument");
+        VMSetRuntimeError(pVM, false, "enum", "some %s string", "error");
 
         /*
@@ -158 +291 @@
         {
             RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%Vrc\n", rc);
-            cErrors++;
+            g_cErrors++;
         }
     }
@@ -164 +297 @@
     {
         RTPrintf(TESTCASE ": fatal error: failed to create vm! rc=%Vrc\n", rc);
-        cErrors++;
+        g_cErrors++;
     }
 
@@ -170 +303 @@
      * Summary and return.
      */
-    if (!cErrors)
+    if (!g_cErrors)
         RTPrintf(TESTCASE ": SUCCESS\n");
     else
-        RTPrintf(TESTCASE ": FAILURE - %d errors\n", cErrors);
-
-    return !!cErrors;
-}
+        RTPrintf(TESTCASE ": FAILURE - %d errors\n", g_cErrors);
+
+    return !!g_cErrors;
+}