Changeset 84585 in vbox for trunk/src/VBox/Main

Timestamp:

May 28, 2020 12:14:17 PM (5 years ago)

Author:

vboxsync

Message:

Main + FE/VBoxManage: Fixes / better logging for reboot / shutdown support.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (4 diffs)

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

@@ -513 +513 @@
         return setError(E_INVALIDARG, tr("Invalid combination of flags (%#x)"), fFlags);
 
+    Utf8Str strAction = (fFlags & GuestShutdownFlag_Reboot) ? tr("Rebooting") : tr("Shutting down");
+
     /*
      * Create an anonymous session. This is required to run shutting down / rebooting
@@ -518 +520 @@
      */
     GuestSessionStartupInfo startupInfo;
-    startupInfo.mName = "Shutting down guest";
+    startupInfo.mName = strAction + " guest";
 
     GuestCredentials guestCreds;
@@ -541 +543 @@
                     case VERR_NOT_SUPPORTED:
                         hrc = setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
-                                           tr("Shutting down not supported by installed Guest Additions"), vrc);
+                                           tr("%s not supported by installed Guest Additions"), strAction.c_str());
                         break;
 
@@ -548 +550 @@
                         if (vrc == VERR_GSTCTL_GUEST_ERROR)
                             vrc = rcGuest;
-                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Could not shut down guest: %Rrc"), vrc);
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Error %s guest: %Rrc"), strAction.c_str(), vrc);
                         break;
                     }