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

Timestamp:

Jun 12, 2020 12:43:02 PM (5 years ago)

Author:

vboxsync

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

138620

Message:

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

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -11791 +11791 @@
   <enum
     name="GuestShutdownFlag"
-    uuid="587309CD-DDDA-4619-82B0-4B764D9D3BC1"
+    uuid="28D19C9C-5862-4930-B29A-F117712B4864"
   >
     <desc>
@@ -11805 +11805 @@
     <const name="Reboot"                    value="2">
       <desc>Performs a reboot after shutdown.</desc>
+    </const>
+    <const name="Force"                     value="4">
+      <desc>Force the system to shutdown/reboot regardless of objecting
+        application or other stuff. This flag might not be realized on
+        all systems.</desc>
     </const>
   </enum>

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

@@ -505 +505 @@
             fFlags |= aFlags[i];
 
-    const uint32_t fValidFlags = GuestShutdownFlag_None | GuestShutdownFlag_PowerOff | GuestShutdownFlag_Reboot;
+    const uint32_t fValidFlags = GuestShutdownFlag_None
+                               | GuestShutdownFlag_PowerOff | GuestShutdownFlag_Reboot | GuestShutdownFlag_Force;
     if (fFlags & ~fValidFlags)
         return setError(E_INVALIDARG,tr("Unknown flags: flags value %#x, invalid: %#x"), fFlags, fFlags & ~fValidFlags);