Changeset 98608 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 16, 2023 4:28:22 PM (2 years ago)

Author:

vboxsync

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

155900

Message:

Main/GuestProcessImpl.cpp: try fix VERR_IPE_UNINITIALIZED_STATUS errors. bugref:9783

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -1676 +1676 @@
                              fWaitFlags, newStatus, waitResult));
 #endif
-            if (ProcessWaitResult_None != waitResult) /* We got a waiting result. */
+            if (waitResult != ProcessWaitResult_None) /* We got a waiting result. */
                 break;
         }
@@ -1687 +1687 @@
     unregisterWaitEvent(pEvent);
 
-    LogFlowThisFunc(("Returned waitResult=%RU32, newStatus=%RU32, vrc=%Rrc\n", waitResult, newStatus, vrc));
+    LogFlowThisFunc(("returns %Rrc - waitResult=%RU32 newStatus=%RU32 *pvrcGuest=%Rrc\n",
+                     vrc, waitResult, newStatus, pvrcGuest ? *pvrcGuest : -VERR_IPE_UNINITIALIZED_STATUS));
     return vrc;
 }
@@ -1883 +1884 @@
     Assert(vrc != VERR_GSTCTL_GUEST_ERROR || !pvrcGuest || *pvrcGuest != (int)0xcccccccc);
 
-    LogFlowFuncLeaveRC(vrc);
+    LogFlowFunc(("LEAVE: %Rrc *pvrcGuest=%Rrc *pProcessStatus=%d\n",
+                 vrc, pvrcGuest ? *pvrcGuest : -VERR_IPE_UNINITIALIZED_STATUS, pProcessStatus ? *pProcessStatus : -1));
     return vrc;
 }
@@ -2411 +2413 @@
 bool GuestProcessToolbox::isTerminatedOk(void)
 {
-    return getTerminationStatus() == VINF_SUCCESS ? true : false;
+    return getTerminationStatus() == VINF_SUCCESS;
 }
 
@@ -2428 +2430 @@
  */
 /* static */
-int GuestProcessToolbox::run(      GuestSession              *pGuestSession,
-                             const GuestProcessStartupInfo   &startupInfo,
-                                   int                       *pvrcGuest /* = NULL */)
-{
-    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-
+int GuestProcessToolbox::run(GuestSession                  *pGuestSession,
+                             GuestProcessStartupInfo const &startupInfo,
+                             int                           *pvrcGuest /* = NULL */)
+{
     GuestProcessToolErrorInfo errorInfo = { VERR_IPE_UNINITIALIZED_STATUS, INT32_MAX };
     int vrc = runErrorInfo(pGuestSession, startupInfo, errorInfo);
     if (RT_SUCCESS(vrc))
     {
+/** @todo r=bird: Seems like this is duplicated in the runErrInfo or
+ *        something, because it returns with VERR_GSTCTL_GUEST_ERROR.
+ *        Temporary fix is to always set pvrcGuest before returning. */
         /* Make sure to check the error information we got from the guest tool. */
         if (GuestProcess::i_isGuestError(errorInfo.vrcGuest))
         {
             if (errorInfo.vrcGuest == VERR_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
-                vrcGuest = GuestProcessToolbox::exitCodeToRc(startupInfo, errorInfo.iExitCode);
-            else /* At least return something. */
-                vrcGuest = errorInfo.vrcGuest;
-
-            if (pvrcGuest)
-                *pvrcGuest = vrcGuest;
-
+                errorInfo.vrcGuest = GuestProcessToolbox::exitCodeToRc(startupInfo, errorInfo.iExitCode);
             vrc = VERR_GSTCTL_GUEST_ERROR;
         }
     }
 
-    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
+    /* See above. */
+    if (pvrcGuest)
+        *pvrcGuest = errorInfo.vrcGuest;
+
+    LogFlowFunc(("returns %Rrc - vrcGuest=%Rrc iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
     return vrc;
 }
@@ -2513 +2514 @@
     }
 
-    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
+    LogFlowFunc(("returns %Rrc - vrcGuest=%Rrc iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
     return vrc;
 }
@@ -2553 +2554 @@
             {
                 GuestToolboxStreamBlock strmBlk;
-                vrc = procTool.waitEx(  paStrmOutObjects
-                                        ? GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK
-                                        : GUESTPROCESSTOOL_WAIT_FLAG_NONE, &strmBlk, &errorInfo.vrcGuest);
+                vrc = procTool.waitEx(paStrmOutObjects
+                                      ? GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK
+                                      : GUESTPROCESSTOOL_WAIT_FLAG_NONE,
+                                      &strmBlk, &errorInfo.vrcGuest);
                 if (paStrmOutObjects)
                     paStrmOutObjects->push_back(strmBlk);
@@ -2577 +2579 @@
     }
 
-    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
+    LogFlowFunc(("returns %Rrc - vrcGuest=%Rrc iExitCode=%d (%#x)\n",
+                 vrc, errorInfo.vrcGuest, errorInfo.iExitCode, errorInfo.iExitCode));
     return vrc;
 }