Changeset 23703 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Oct 12, 2009 3:34:36 PM (15 years ago)

Author:

vboxsync

Message:

Main,++: Added MachineState_MigratingFrom for use during startup on the migration target.

File:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4730 +4730 @@
      * any error reporting and appropriate state change! */
 
-    if (   mMachineState == MachineState_Saved
-        || fLiveMigrationTarget)
+    if (mMachineState == MachineState_Saved)
         setMachineState(MachineState_Restoring);
+    else if (fLiveMigrationTarget)
+        setMachineState(MachineState_MigratingFrom);
     else
         setMachineState(MachineState_Starting);
@@ -4798 +4799 @@
               mMachineState == MachineState_Starting ||
               mMachineState == MachineState_Restoring ||
+              mMachineState == MachineState_MigratingFrom || /** @todo LiveMigration ???*/
               mMachineState == MachineState_Stopping,
               ("Invalid machine state: %s\n", Global::stringifyMachineState(mMachineState)));
@@ -4809 +4811 @@
      * powerUpThread() is calling us on failure, so the VM is already off at
      * that point. */
-    if (!mVMPoweredOff &&
-        (mMachineState == MachineState_Starting ||
-         mMachineState == MachineState_Restoring))
+    if (   !mVMPoweredOff
+        && (   mMachineState == MachineState_Starting
+            || mMachineState == MachineState_Restoring
+            || mMachineState == MachineState_MigratingFrom)
+       )
         mVMPoweredOff = true;
 
@@ -4819 +4823 @@
      * inappropriate operations while leaving the lock below, Saving or
      * Restoring should be fine too */
-    if (mMachineState != MachineState_Saving &&
-        mMachineState != MachineState_Restoring &&
-        mMachineState != MachineState_Stopping)
+    if (   mMachineState != MachineState_Saving
+        && mMachineState != MachineState_Restoring
+        && mMachineState != MachineState_MigratingFrom
+        && mMachineState != MachineState_Stopping
+       )
         setMachineState(MachineState_Stopping);
 
@@ -5504 +5510 @@
             if (   that->mMachineState != MachineState_Stopping
                 && that->mMachineState != MachineState_Saving
-                && that->mMachineState != MachineState_Restoring)
+                && that->mMachineState != MachineState_Restoring
+                && that->mMachineState != MachineState_MigratingFrom
+               )
             {
                 LogFlowFunc(("VM has powered itself off but Console still thinks it is running. Notifying.\n"));
@@ -5598 +5606 @@
                     that->setMachineState(MachineState_Saved);
                     break;
+                case MachineState_MigratingFrom:
+                    /* Migration failed or was cancelled.  Back to powered off. */
+                    that->setMachineState(MachineState_PoweredOff);
+                    break;
             }
             break;
@@ -5635 +5647 @@
                            && aOldState == VMSTATE_POWERING_ON)
                        || (   (   that->mMachineState == MachineState_Restoring
+                               || that->mMachineState == MachineState_MigratingFrom
                                || that->mMachineState == MachineState_Paused)
                            && aOldState == VMSTATE_RESUMING));
@@ -6828 +6841 @@
     catch (HRESULT aRC) { rc = aRC; }
 
-    if (console->mMachineState == MachineState_Starting ||
-        console->mMachineState == MachineState_Restoring)
+    if (   console->mMachineState == MachineState_Starting
+        || console->mMachineState == MachineState_Restoring
+        || console->mMachineState == MachineState_MigratingFrom
+       )
     {
         /* We are still in the Starting/Restoring state. This means one of: