Changeset 24362 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 1:36:14 AM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl.cpp: vmstate callback bits of teleporting.

File:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2571 +2571 @@
     {
         delete pTask;
-    }
-
-    LogFlowThisFunc(("rc=%08X\n", rc));
+        NOREF(rc);
+    }
+
+    LogFlowThisFunc(("rc=%Rhrc\n", rc));
     LogFlowThisFuncLeave();
     return rc;
@@ -5670 +5671 @@
         case VMSTATE_SUSPENDED:
         {
-            /** @todo Live Migration: state/live VMSTATE_SUSPENDING_LS. */
             if (aOldState == VMSTATE_SUSPENDING)
             {
@@ -5682 +5682 @@
                 that->setMachineState(MachineState_Paused);
             }
+            break;
+        }
+
+        case VMSTATE_SUSPENDED_LS:
+        case VMSTATE_SUSPENDED_EXT_LS:
+        {
+            AutoWriteLock alock(that);
+            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) ));
             break;
         }
@@ -5710 +5725 @@
             break;
         }
+
+        case VMSTATE_RUNNING_LS:
+            AssertMsg(   that->mMachineState == MachineState_LiveSnapshotting
+                      || that->mMachineState == MachineState_Teleporting,
+                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(aOldState),  VMR3GetStateName(aState) ));
+            break;
 
         case VMSTATE_FATAL_ERROR: