Changeset 71301 in vbox for trunk

Timestamp:

Mar 12, 2018 4:24:27 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Process: Check guest error information in the GuestProcessTool static helpers more diligent.

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (1 diff)
• src-client/GuestProcessImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/GuestProcessImpl.h

@@ -188 +188 @@
 {
     /** Return code from the guest side for executing the process tool. */
-    int  rcGuest;
+    int     rcGuest;
     /** The process tool's returned exit code. */
     int32_t iExitCode;

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

@@ -2045 +2045 @@
 }
 
+/**
+ * Static helper function to start and wait for a certain toolbox tool.
+ *
+ * This function most likely is the one you want to use in the first place if you
+ * want to just use a toolbox tool and wait for its result. See runEx() if you also
+ * needs its output.
+ *
+ * @return  VBox status code.
+ * @param   pGuestSession           Guest control session to use for starting the toolbox tool in.
+ * @param   startupInfo             Startup information about the toolbox tool.
+ * @param   prcGuest                Where to store the toolbox tool's specific error code in case
+ *                                  VERR_GSTCTL_GUEST_ERROR is returned.
+ */
 /* static */
 int GuestProcessTool::run(      GuestSession              *pGuestSession,
@@ -2056 +2069 @@
     if (RT_SUCCESS(vrc))
     {
-        if (errorInfo.rcGuest == VWRN_GSTCTL_PROCESS_EXIT_CODE)
-            rcGuest = GuestProcessTool::exitCodeToRc(startupInfo, errorInfo.iExitCode);
-        else
-            rcGuest = errorInfo.rcGuest;
-
-        if (prcGuest)
-            *prcGuest = rcGuest;
-    }
-
+        /* Make sure to check the error information we got from the guest tool. */
+        if (GuestProcess::i_isGuestError(errorInfo.rcGuest))
+        {
+            if (errorInfo.rcGuest == VWRN_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
+                rcGuest = GuestProcessTool::exitCodeToRc(startupInfo, errorInfo.iExitCode);
+            else /* At least return something. */
+                rcGuest = errorInfo.rcGuest;
+
+            if (prcGuest)
+                *prcGuest = rcGuest;
+
+            vrc = VERR_GSTCTL_GUEST_ERROR;
+        }
+    }
+
+    LogFlowFunc(("Returned rc=%Rrc, rcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.rcGuest, errorInfo.iExitCode));
     return vrc;
 }
 
 /**
- * Static helper function to start and wait for a certain toolbox tool.
+ * Static helper function to start and wait for a certain toolbox tool, returning
+ * extended error information from the guest.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pGuestSession           Guest control session to use for starting the toolbox tool in.
  * @param   startupInfo             Startup information about the toolbox tool.
@@ -2082 +2103 @@
 {
     return runExErrorInfo(pGuestSession, startupInfo,
-                            NULL /* paStrmOutObjects */, 0 /* cStrmOutObjects */,
-                            errorInfo);
+                          NULL /* paStrmOutObjects */, 0 /* cStrmOutObjects */, errorInfo);
 }
 
@@ -2110 +2130 @@
     if (RT_SUCCESS(vrc))
     {
-        if (errorInfo.rcGuest == VWRN_GSTCTL_PROCESS_EXIT_CODE)
-            rcGuest = GuestProcessTool::exitCodeToRc(startupInfo, errorInfo.iExitCode);
-        else
-            rcGuest = errorInfo.rcGuest;
-
-        /* Return VERR_GSTCTL_GUEST_ERROR if we retrieved a guest return code. */
-        if (RT_FAILURE(rcGuest))
+        /* Make sure to check the error information we got from the guest tool. */
+        if (GuestProcess::i_isGuestError(errorInfo.rcGuest))
+        {
+            if (errorInfo.rcGuest == VWRN_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
+                rcGuest = GuestProcessTool::exitCodeToRc(startupInfo, errorInfo.iExitCode);
+            else /* At least return something. */
+                rcGuest = errorInfo.rcGuest;
+
+            if (prcGuest)
+                *prcGuest = rcGuest;
+
             vrc = VERR_GSTCTL_GUEST_ERROR;
-
-        if (prcGuest)
-            *prcGuest = rcGuest;
-    }
-
+        }
+    }
+
+    LogFlowFunc(("Returned rc=%Rrc, rcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.rcGuest, errorInfo.iExitCode));
     return vrc;
 }
@@ -2133 +2156 @@
  * on stdout and can be used on the host side to retrieve more information about the actual command issued on the guest side.
  *
- * @return  IPRT status code.
+ * @return  VBox status code.
  * @param   pGuestSession           Guest control session to use for starting the toolbox tool in.
  * @param   startupInfo             Startup information about the toolbox tool.