Changeset 24301 in vbox for trunk/src/VBox/Main/SnapshotImpl.cpp

Timestamp:

Nov 3, 2009 10:07:55 PM (15 years ago)

Author:

vboxsync

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

54298

Message:

Main,Frontends: Added two new running states: Teleporting and LiveSnapshotting. Also added TeleportingPausedVM. Renamed TeleportingFrom to TeleportingIn.

File:

• trunk/src/VBox/Main/SnapshotImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1272 +1272 @@
         mMediaData.backup();
 
-        /* set the state to Saving (this is expected by Console::TakeSnapshot()) */
-        setMachineState(MachineState_Saving);
+        /* Console::fntTakeSnapshotWorker and friends expects this. */
+        if (mSnapshotData.mLastState == MachineState_Running)
+            setMachineState(MachineState_LiveSnapshotting);
+        else
+            setMachineState(MachineState_Saving); /** @todo Confusing! Saving is used for both online and offline snapshots. */
 
         /* create new differencing hard disks and attach them to this machine */
@@ -1351 +1354 @@
     AutoWriteLock alock(this);
 
-    AssertReturn(!aSuccess ||
-                  (mData->mMachineState == MachineState_Saving &&
-                   mSnapshotData.mLastState != MachineState_Null &&
-                   !mSnapshotData.mSnapshot.isNull()),
-                  E_FAIL);
+    AssertReturn(   !aSuccess
+                 || (    (    mData->mMachineState == MachineState_Saving
+                          ||  mData->mMachineState == MachineState_LiveSnapshotting)
+                     &&  mSnapshotData.mLastState != MachineState_Null
+                     &&  !mSnapshotData.mSnapshot.isNull()
+                    )
+                 , E_FAIL);
 
     /*