Changeset 90890 in vbox for trunk

Timestamp:

Aug 25, 2021 4:46:48 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Runtime UI: Move ACPI shutdown stuff to the place where it belongs (UISession).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -385 +385 @@
 }
 #endif /* VBOX_WS_MAC */
-
-void UIMachineLogic::shutdown()
-{
-    /* Warn the user about ACPI is not available if so: */
-    if (!console().GetGuestEnteredACPIMode())
-        return UINotificationMessage::cannotSendACPIToMachine();
-
-    /* Shutdown: */
-    uisession()->shutdown();
-}
 
 void UIMachineLogic::powerOff(bool fDiscardingState)
@@ -1881 +1871 @@
 
     LogRel(("GUI: User requested to shutdown VM.\n"));
-    shutdown();
+    uisession()->shutdown();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -143 +143 @@
 #endif /* VBOX_WS_MAC */
 
-    /** Call for guest shutdown to close Runtime UI. */
-    void shutdown();
     /** Power off VM, then close Runtime UI. */
     void powerOff(bool fDiscardingState);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -462 +462 @@
             /* Shutdown VM: */
             LogRel(("GUI: Request for close-action to shutdown VM.\n"));
-            machineLogic()->shutdown();
+            uisession()->shutdown();
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -356 +356 @@
 }
 
-bool UISession::shutdown()
-{
+void UISession::shutdown()
+{
+    /* Warn the user about ACPI is not available if so: */
+    if (!console().GetGuestEnteredACPIMode())
+        return UINotificationMessage::cannotSendACPIToMachine();
+
     /* Send ACPI shutdown signal if possible: */
+    LogRel(("GUI: Sending ACPI shutdown signal..\n"));
     console().PowerButton();
     if (!console().isOk())
-    {
-        /* Failed in console: */
         msgCenter().cannotACPIShutdownMachine(console());
-        return false;
-    }
-    /* Passed: */
-    return true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -82 +82 @@
     void saveState();
     /** Calls for guest shutdown to close Runtime UI. */
-    bool shutdown();
+    void shutdown();
     /** Powers VM down, then closes Runtime UI. */
     bool powerOff(bool fIncludingDiscard, bool &fServerCrashed);