Changeset 24899 in vbox for trunk

Timestamp:

Nov 24, 2009 1:31:21 PM (15 years ago)

Author:

vboxsync

Message:

Main: Fixed VM power of during teleportation.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (4 diffs)
• ConsoleImplTeleporter.cpp (modified) (1 diff)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -270 +270 @@
     , mVMDestroying(false)
     , mVMPoweredOff(false)
+    , mVMIsAlreadyPoweringOff(false)
     , mVMMDev(NULL)
     , mAudioSniffer(NULL)
@@ -5661 +5662 @@
                 && that->mMachineState != MachineState_TeleportingIn
                 && that->mMachineState != MachineState_LiveSnapshotting
-                && that->mMachineState != MachineState_Teleporting
                 && that->mMachineState != MachineState_TeleportingPausedVM
+                && !that->mVMIsAlreadyPoweringOff
                )
             {
@@ -5761 +5762 @@
                     that->setMachineState(MachineState_PoweredOff);
                     break;
-                case MachineState_Teleporting:
                 case MachineState_TeleportingPausedVM:
                     /* Successfully teleported the VM. */
@@ -5790 +5790 @@
                 case MachineState_Saving:
                 case MachineState_Restoring:
+                case MachineState_Stopping:
+                case MachineState_TeleportingIn:
                     /* The worker threads handles the transition. */
                     break;

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -769 +769 @@
 
         autoVMCaller.release();
+
+        pState->mptrConsole->mVMIsAlreadyPoweringOff = true; /* (Make sure we stick in the TeleportingPausedVM state.) */
         hrc = pState->mptrConsole->powerDown();
+        pState->mptrConsole->mVMIsAlreadyPoweringOff = false;
+
         pState->mptrProgress->notifyComplete(hrc);
     }

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -563 +563 @@
     /** true when power down is initiated by vmstateChangeCallback (EMT) */
     bool mVMPoweredOff : 1;
+    /** true when vmstateChangeCallback shouldn't initiate a power down.  */
+    bool mVMIsAlreadyPoweringOff : 1;
 
     /** The current network attachment type in the VM.