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

Timestamp:

Nov 24, 2009 7:09:23 PM (15 years ago)

Author:

vboxsync

Message:

SnapshotImpl.cpp: BeginSnapshot error path (#4486).

File:

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

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1198 +1198 @@
     AssertReturn(aStateFilePath, E_POINTER);
 
-    LogFlowThisFunc(("aName='%ls'\n", aName));
+    LogFlowThisFunc(("aName='%ls' fTakingSnapshotOnline=%RTbool\n", aName, fTakingSnapshotOnline));
 
     AutoCaller autoCaller(this);
@@ -1266 +1266 @@
     {
         LogFlowThisFunc(("Creating differencing hard disks (online=%d)...\n",
-                        fTakingSnapshotOnline));
+                         fTakingSnapshotOnline));
 
         // backup the media data so we can recover if things goes wrong along the day;
@@ -1283 +1283 @@
                                  1,            // operation weight; must be the same as in Console::TakeSnapshot()
                                  !!fTakingSnapshotOnline);
-
-        if (SUCCEEDED(rc) && mSnapshotData.mLastState == MachineState_Saved)
+        if (FAILED(rc))
+            throw rc;
+
+        if (mSnapshotData.mLastState == MachineState_Saved)
         {
             Utf8Str stateFrom = mSSData->mStateFilePath;
@@ -1290 +1292 @@
 
             LogFlowThisFunc(("Copying the execution state from '%s' to '%s'...\n",
-                            stateFrom.raw(), stateTo.raw()));
+                             stateFrom.raw(), stateTo.raw()));
 
             aConsoleProgress->SetNextOperation(Bstr(tr("Copying the execution state")),
@@ -1308 +1310 @@
 
             if (RT_FAILURE(vrc))
+            {
+                /** @todo r=bird: Delete stateTo when appropriate. */
                 throw setError(E_FAIL,
                                tr("Could not copy the state file '%s' to '%s' (%Rrc)"),
@@ -1313 +1317 @@
                                stateTo.raw(),
                                vrc);
+            }
         }
     }
     catch (HRESULT hrc)
     {
+        LogThisFunc(("Caught %Rhrc [%s]\n", hrc, Global::stringifyMachineState(mData->mMachineState) ));
+        if (    mSnapshotData.mLastState != mData->mMachineState
+            &&  (  mSnapshotData.mLastState == MachineState_Running
+                 ? mData->mMachineState == MachineState_LiveSnapshotting
+                 : mData->mMachineState == MachineState_Saving)
+           )
+            setMachineState(mSnapshotData.mLastState);
+
         pSnapshot->uninit();
         pSnapshot.setNull();
+        mSnapshotData.mLastState = MachineState_Null;
+        mSnapshotData.mSnapshot.setNull();
+
         rc = hrc;
     }
 
-    if (fTakingSnapshotOnline)
+    if (fTakingSnapshotOnline && SUCCEEDED(rc))
         strStateFilePath.cloneTo(aStateFilePath);
     else
         *aStateFilePath = NULL;
 
-    LogFlowThisFuncLeave();
+    LogFlowThisFunc(("LEAVE - %Rhrc [%s]\n", rc, Global::stringifyMachineState(mData->mMachineState) ));
     return rc;
 }
@@ -1365 +1381 @@
      * Restore the state we had when BeginTakingSnapshot() was called,
      * Console::fntTakeSnapshotWorker restores its local copy when we return.
-     * If the state was Running, then let Console::fntTakeSnapshotWorker it
-     * all via Console::Resume().
+     * If the state was Running, then let Console::fntTakeSnapshotWorker do it
+     * all to avoid races.
      */
     if (   mData->mMachineState != mSnapshotData.mLastState