Changeset 23012 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Sep 14, 2009 4:38:13 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52308

Message:

VMM,Devices,Main: VMR3ReqCall w/ RT_INDEFINITE_WAIT -> VMR3ReqCallWait.

Location:

trunk/src/VBox/VMM/testcase

Files:

• tstAnimate.cpp (modified) (3 diffs)
• tstVMM-HwAccm.cpp (modified) (2 diffs)
• tstVMM.cpp (modified) (2 diffs)
• tstVMMFork.cpp (modified) (1 diff)
• tstVMREQ.cpp (modified) (2 diffs)

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

@@ -834 +834 @@
          * Load memory.
          */
-        PVMREQ pReq1 = NULL;
         if (FileRawMem != NIL_RTFILE)
-            rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)loadMem, 3, pVM, FileRawMem, &offRawMem);
+            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)loadMem, 3, pVM, FileRawMem, &offRawMem);
         else
-            rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)SSMR3Load, 4, pVM, pszSavedState, SSMAFTER_DEBUG_IT, NULL, NULL);
-        AssertReleaseRC(rc);
-        rc = pReq1->iStatus;
-        VMR3ReqFree(pReq1);
+            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)SSMR3Load, 4, pVM, pszSavedState, SSMAFTER_DEBUG_IT, NULL, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -848 +844 @@
              */
             if (FileScript != NIL_RTFILE)
-            {
-                rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)scriptRun, 2, pVM, FileScript);
-                AssertReleaseRC(rc);
-                rc = pReq1->iStatus;
-                VMR3ReqFree(pReq1);
-            }
+                rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)scriptRun, 2, pVM, FileScript);
             if (RT_SUCCESS(rc))
             {
@@ -877 +868 @@
                     if (RT_SUCCESS(rc))
                     {
-                        rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)EMR3RawSetMode, 2, pVM, EMRAW_NONE);
+                        rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)EMR3RawSetMode, 2, pVM, EMRAW_NONE);
                         AssertReleaseRC(rc);
-                        VMR3ReqFree(pReq1);
-
                         DBGFR3Info(pVM, "cpumguest", "verbose", NULL);
                         if (fPowerOn)

trunk/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp

@@ -93 +93 @@
          */
         RTPrintf(TESTCASE ": Testing...\n");
-        PVMREQ pReq1 = NULL;
-        rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)VMMDoHwAccmTest, 1, pVM);
+        rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMMDoHwAccmTest, 1, pVM);
         AssertRC(rc);
-        VMR3ReqFree(pReq1);
 
         STAMR3Dump(pVM, "*");
@@ -104 +102 @@
          */
         rc = VMR3Destroy(pVM);
-        if (!RT_SUCCESS(rc))
+        if (RT_FAILURE(rc))
         {
             RTPrintf(TESTCASE ": error: failed to destroy vm! rc=%d\n", rc);

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

@@ -281 +281 @@
             {
                 RTTestSub(hTest, "VMM");
-                PVMREQ pReq1 = NULL;
-                rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)VMMDoTest, 1, pVM);
+                rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMMDoTest, 1, pVM);
                 if (RT_FAILURE(rc))
-                    RTTestFailed(hTest, "VMR3ReqCall failed: rc=%Rrc\n", rc);
-                else if (RT_FAILURE(pReq1->iStatus))
                     RTTestFailed(hTest, "VMMDoTest failed: rc=%Rrc\n", rc);
-                VMR3ReqFree(pReq1);
                 break;
             }
@@ -301 +297 @@
                 }
 
-                PVMREQ pReq1 = NULL;
-                rc = VMR3ReqCall(pVM, 0, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)tstTMWorker, 2, pVM, hTest);
+                rc = VMR3ReqCallWait(pVM, 0 /*idDstCpu*/, (PFNRT)tstTMWorker, 2, pVM, hTest);
                 if (RT_FAILURE(rc))
-                    RTTestFailed(hTest, "VMR3ReqCall failed: rc=%Rrc\n", rc);
-                else if (RT_FAILURE(pReq1->iStatus))
                     RTTestFailed(hTest, "VMMDoTest failed: rc=%Rrc\n", rc);
-                VMR3ReqFree(pReq1);
                 break;
             }

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

@@ -136 +136 @@
                 RTPrintf(TESTCASE ": fork() returned fine.\n");
                 RTPrintf(TESTCASE ": testing VM after fork.\n");
-                PVMREQ pReq1 = NULL;
-                rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq1, RT_INDEFINITE_WAIT, (PFNRT)VMMDoTest, 1, pVM);
-                AssertRC(rc);
-                VMR3ReqFree(pReq1);
+                VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMMDoTest, 1, pVM);
 
                 STAMR3Dump(pVM, "*");

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

@@ -134 +134 @@
 #endif
 
-    PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PassVACallback, 5,
-                         pVM, _4K, _1G, pszFormat, pvVA);
-    if (RT_SUCCESS(rc))
-        rc = pReq->iStatus;
-    VMR3ReqFree(pReq);
+    int rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)PassVACallback, 5, pVM, _4K, _1G, pszFormat, pvVA);
+    NOREF(rc);
 
 #if 1
@@ -156 +152 @@
     va_list va1;
     va_start(va1, pszFormat);
-    PVMREQ pReq;
-    int rc = VMR3ReqCall(pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)PassVACallback, 5,
-                         pVM, _4K, _1G, pszFormat, &va1);
-    if (RT_SUCCESS(rc))
-        rc = pReq->iStatus;
-    VMR3ReqFree(pReq);
+    int rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)PassVACallback, 5, pVM, _4K, _1G, pszFormat, &va1);
     va_end(va1);
+    NOREF(rc);
 
     /* 2nd test */