Changeset 43656 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 16, 2012 3:18:28 PM (13 years ago)

Author:

vboxsync

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

81422

Message:

Autostart/stop: Further work on the stop part

File:

• trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp

@@ -158 +158 @@
                 CHECK_ERROR_BREAK(machine, COMGETTER(State)(&enmMachineState));
 
+                /* Wait until the VM changes from a transient state back. */
+                while (   enmMachineState >= MachineState_FirstTransient
+                       && enmMachineState <= MachineState_LastTransient)
+                {
+                    RTThreadSleep(1000);
+                    CHECK_ERROR_BREAK(machine, COMGETTER(State)(&enmMachineState));
+                }
+
                 /* Only power off running machines. */
-                /** @todo: What about transient VM states? */
                 if (   enmMachineState == MachineState_Running
                     || enmMachineState == MachineState_Paused)
                 {
-                    ComPtr<IMachine> sessionMachine;
                     ComPtr<IConsole> console;
                     ComPtr<IProgress> progress;
@@ -172 +178 @@
                     /* get the associated console */
                     CHECK_ERROR_BREAK(g_pSession, COMGETTER(Console)(console.asOutParam()));
-                    CHECK_ERROR_BREAK(g_pSession, COMGETTER(Machine)(sessionMachine.asOutParam()));
 
                     switch ((*it).enmAutostopType)
@@ -194 +199 @@
                             BOOL fGuestEnteredACPI = false;
                             CHECK_ERROR_BREAK(console, GetGuestEnteredACPIMode(&fGuestEnteredACPI));
-                            if (fGuestEnteredACPI)
+                            if (fGuestEnteredACPI && enmMachineState == MachineState_Running)
+                            {
                                 CHECK_ERROR_BREAK(console, PowerButton());
+
+                                serviceLog("Waiting for VM \"%ls\" to power off...\n", (*it).strId.raw());
+
+                                do
+                                {
+                                    RTThreadSleep(1000);
+                                    CHECK_ERROR_BREAK(machine, COMGETTER(State)(&enmMachineState));
+                                } while (enmMachineState == MachineState_Running);
+                            }
                             else
                             {
                                 /* Use save state instead and log this to the console. */
-                                serviceLog("The guest of VM \"%ls\" does not support ACPI shutdown, saving state...\n",
+                                serviceLog("The guest of VM \"%ls\" does not support ACPI shutdown or is currently paused, saving state...\n",
                                            (*it).strId.raw());
                                 rc = autostartSaveVMState(console);
@@ -208 +223 @@
                             serviceLog("Unknown autostop type for VM \"%ls\"\n", (*it).strId.raw());
                     }
-                }
-                g_pSession->UnlockMachine();
+                    g_pSession->UnlockMachine();
+                }
             }
         }