Changeset 93036 in vbox

Timestamp:

Dec 21, 2021 9:29:38 AM (3 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Let GuestProcess::i_terminateProcess() return a dedicated status when process (already) is in a terminated / wrong status, so that caller can react based on that.

File:

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

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

@@ -1321 +1321 @@
  *
  * @returns VBox status code.
+ * @retval  VWRN_INVALID_STATE if process not in running state (anymore).
+ * @retval  VERR_NOT_SUPPORTED if process termination is not supported on the guest.
  * @param   uTimeoutMS          Timeout (in ms) to wait for process termination.
  * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
@@ -1340 +1342 @@
         LogFlowThisFunc(("Process not in started state (state is %RU32), skipping termination\n",
                          mData.mStatus));
+        vrc = VWRN_INVALID_STATE;
     }
     else
@@ -2045 +2048 @@
     }
 
-    /* Remove process from guest session list. Now only API clients
-     * still can hold references to it. */
-    AssertPtr(mSession);
-    int rc2 = mSession->i_processUnregister(this);
-    if (RT_SUCCESS(vrc))
-        vrc = rc2;
+    if (vrc == VINF_SUCCESS) /* Note: Also could be VWRN_INVALID_STATE from i_terminateProcess(). */
+    {
+        /* Remove process from guest session list. Now only API clients
+         * still can hold references to it. */
+        AssertPtr(mSession);
+        int rc2 = mSession->i_processUnregister(this);
+        if (RT_SUCCESS(vrc))
+            vrc = rc2;
+    }
 
     LogFlowFuncLeaveRC(vrc);