Changeset 35481 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jan 11, 2011 12:40:24 PM (14 years ago)

Author:

vboxsync

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

69356

Message:

Main/Console: fix poweroff regression introduced when moving the progress object to VBoxSVC

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (5 diffs)

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

@@ -241 +241 @@
 {
     VMPowerDownTask(Console *aConsole,
-                    const ComPtr<IProgress> &aServerProgress,
-                    MachineState_T aLastMachineState)
+                    const ComPtr<IProgress> &aServerProgress)
+        : VMTask(aConsole, NULL /* aProgress */, aServerProgress,
+                 true /* aUsesVMPtr */)
+    {}
+};
+
+struct VMSaveTask : public VMTask
+{
+    VMSaveTask(Console *aConsole,
+               const ComPtr<IProgress> &aServerProgress,
+               const Utf8Str &aSavedStateFile)
         : VMTask(aConsole, NULL /* aProgress */, aServerProgress,
                  true /* aUsesVMPtr */),
-          mLastMachineState(aLastMachineState)
+          mSavedStateFile(aSavedStateFile)
     {}
 
-    MachineState_T mLastMachineState;
-};
-
-struct VMSaveTask : public VMTask
-{
-    VMSaveTask(Console *aConsole,
-               const ComPtr<IProgress> &aServerProgress,
-               const Utf8Str &aSavedStateFile,
-               MachineState_T aLastMachineState)
-        : VMTask(aConsole, NULL /* aProgress */, aServerProgress,
-                 true /* aUsesVMPtr */),
-          mSavedStateFile(aSavedStateFile),
-          mLastMachineState(aLastMachineState)
-    {}
-
     Utf8Str mSavedStateFile;
-    MachineState_T mLastMachineState;
 };
 
@@ -1821 +1814 @@
 
         /* setup task object and thread to carry out the operation asynchronously */
-        std::auto_ptr<VMPowerDownTask> task(new VMPowerDownTask(this, pProgress,
-                                                                lastMachineState));
+        std::auto_ptr<VMPowerDownTask> task(new VMPowerDownTask(this, pProgress));
         AssertBreakStmt(task->isOk(), rc = E_FAIL);
 
@@ -2468 +2460 @@
         /* create a task object early to ensure mpVM protection is successful */
         std::auto_ptr<VMSaveTask> task(new VMSaveTask(this, pProgress,
-                                                      stateFilePath,
-                                                      lastMachineState));
+                                                      stateFilePath));
         rc = task->rc();
         /*
@@ -6446 +6437 @@
                 that->mVMPoweredOff = true;
 
-                /* we are stopping now */
-                that->setMachineState(MachineState_Stopping);
+                /*
+                 * request a progress object from the server
+                 * (this will set the machine state to Stopping on the server
+                 * to block others from accessing this machine)
+                 */
+                ComPtr<IProgress> pProgress;
+                HRESULT rc = that->mControl->BeginPoweringDown(pProgress.asOutParam());
+                AssertComRC(rc);
+
+                /* sync the state with the server */
+                that->setMachineStateLocally(MachineState_Stopping);
 
                 /* Setup task object and thread to carry out the operation
@@ -6455 +6455 @@
                  */
                 std::auto_ptr<VMPowerDownTask> task(new VMPowerDownTask(that,
-                                                                        NULL /* aServerProgress */,
-                                                                        MachineState_Null));
+                                                                        pProgress));
 
                  /* If creating a task failed, this can currently mean one of