Changeset 84816 in vbox

Timestamp:

Jun 12, 2020 12:53:12 PM (5 years ago)

Author:

vboxsync

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

138622

Message:

Guest Control: Also implemented a "force" flag for the reboot/shutdown command [build fix]. bugref:9320

Location:

trunk

Files:

• include/VBox/GuestHost/GuestControl.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/GuestControl.h ¶

@@ -135 +135 @@
 /** @} */
 
+/** @name SHUTDOWN_FLAG_XXX - Guest shutdown flags.
+ * Must match Main's GuestShutdownFlag_ definitions.
+ * @{
+ */
+#define SHUTDOWN_FLAG_NONE                  UINT32_C(0)
+#define SHUTDOWN_FLAG_POWER_OFF             RT_BIT(0)
+#define SHUTDOWN_FLAG_REBOOT                RT_BIT(1)
+#define SHUTDOWN_FLAG_FORCE                 RT_BIT(2)
+/** @} */
+
 /** @name Defines for default (initial) guest process buffer lengths.
  * Note: These defaults were the maximum values before; so be careful when raising those in order to

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp ¶

@@ -1021 +1021 @@
             int fSystemShutdown = RTSYSTEM_SHUTDOWN_PLANNED;
 
-            /* Translate GuestShutdownFlag_XXX into RTSYSTEM_SHUTDOWN_ flags. */
-            if (fAction & GuestShutdownFlag_Reboot)
+            /* Translate SHUTDOWN_FLAG_ into RTSYSTEM_SHUTDOWN_ flags. */
+            if (fAction & SHUTDOWN_FLAG_REBOOT)
                 fSystemShutdown |= RTSYSTEM_SHUTDOWN_REBOOT;
-            else
+            else /* SHUTDOWN_FLAG_POWER_OFF */
                 fSystemShutdown |= RTSYSTEM_SHUTDOWN_POWER_OFF;
 
-            if (fAction & GuestShutdownFlag_Force)
+            if (fAction & SHUTDOWN_FLAG_FORCE)
                 fSystemShutdown |= RTSYSTEM_SHUTDOWN_FORCE;