Changeset 24882 in vbox for trunk

Timestamp:

Nov 23, 2009 5:40:18 PM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl.cpp: Made IConsole::Pause() while teleporting work.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1725 +1725 @@
         case MachineState_Paused:
         case MachineState_TeleportingPausedVM:
+        case MachineState_Saving:
             return setError(VBOX_E_INVALID_VM_STATE, tr("Already paused"));
 
@@ -5771 +5772 @@
         case VMSTATE_SUSPENDED:
         {
-            if (aOldState == VMSTATE_SUSPENDING)
+            AutoWriteLock alock(that);
+
+            if (that->mVMStateChangeCallbackDisabled)
+                break;
+
+            switch (that->mMachineState)
             {
-                AutoWriteLock alock(that);
-
-                if (that->mVMStateChangeCallbackDisabled)
+                case MachineState_Teleporting:
+                    that->setMachineState(MachineState_TeleportingPausedVM);
                     break;
 
-                /* Change the machine state from Running to Paused. */
-/** @todo Live Migration: Deal with Pause happening before VMR3Teleport! */
-                AssertBreak(that->mMachineState == MachineState_Running);
-                that->setMachineState(MachineState_Paused);
+                case MachineState_LiveSnapshotting:
+                    that->setMachineState(MachineState_Saving);
+                    break;
+
+                case MachineState_TeleportingPausedVM:
+                case MachineState_Saving:
+                case MachineState_Restoring:
+                    /* The worker threads handles the transition. */
+                    break;
+
+                default:
+                    AssertMsgFailed(("%s\n", Global::stringifyMachineState(that->mMachineState)));
+                case MachineState_Running:
+                    that->setMachineState(MachineState_Paused);
+                    break;
             }
             break;
@@ -5792 +5808 @@
             if (that->mVMStateChangeCallbackDisabled)
                 break;
-            if (that->mMachineState == MachineState_Teleporting)
-                that->setMachineState(MachineState_TeleportingPausedVM);
-            else if (that->mMachineState == MachineState_LiveSnapshotting)
-                that->setMachineState(MachineState_Saving);
-            else
-                AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(aOldState),  VMR3GetStateName(aState) ));
+            switch (that->mMachineState)
+            {
+                case MachineState_Teleporting:
+                    that->setMachineState(MachineState_TeleportingPausedVM);
+                    break;
+
+                case MachineState_LiveSnapshotting:
+                    that->setMachineState(MachineState_Saving);
+                    break;
+
+                case MachineState_TeleportingPausedVM:
+                case MachineState_Saving:
+                    /* ignore */
+                    break;
+
+                default:
+                    AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(aOldState),  VMR3GetStateName(aState) ));
+                    that->setMachineState(MachineState_Paused);
+                    break;
+            }
             break;
         }