Changeset 33318 in vbox

Timestamp:

Oct 21, 2010 4:16:03 PM (15 years ago)

Author:

vboxsync

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

66894

Message:

Main/Snapshot: fix live deletion of the first snapshot (regression introduced by the new code for deleting the first and only snapshot)

File:

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

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -2677 +2677 @@
                     childSnapshotId = pChildSnapshot->getId();
                 }
-                // If this is an online deletion the attachment was updated
-                // already as it is required to continue execution immediately.
-                // Needs a bit of special treatment due to this difference.
-                if (it->mfNeedsOnlineMerge)
+                pAtt = findAttachment(pMachine->mMediaData->mAttachments, it->mpSource);
+                if (pAtt)
                 {
+                    AutoWriteLock attLock(pAtt COMMA_LOCKVAL_SRC_POS);
+                    pAtt->updateMedium(it->mpTarget);
                     it->mpTarget->addBackReference(pMachine->mData->mUuid, childSnapshotId);
                 }
                 else
                 {
-                    pAtt = findAttachment(pMachine->mMediaData->mAttachments, it->mpSource);
                     // If no attachment is found do not change anything. Maybe
                     // the source medium was not attached to the snapshot.
-                    if (pAtt)
-                    {
-                        AutoWriteLock attLock(pAtt COMMA_LOCKVAL_SRC_POS);
-                        pAtt->updateMedium(it->mpTarget);
+                    // If this is an online deletion the attachment was updated
+                    // already to allow the VM continue execution immediately.
+                    // Needs a bit of special treatment due to this difference.
+                    if (it->mfNeedsOnlineMerge)
                         it->mpTarget->addBackReference(pMachine->mData->mUuid, childSnapshotId);
-                    }
                 }
             }
@@ -3260 +3258 @@
     ComObjPtr<Medium> pTarget(static_cast<Medium *>(aTarget));
     ComObjPtr<Medium> pParentForTarget(static_cast<Medium *>(aParentForTarget));
+    bool fSourceHasChildren = false;
 
     // all hard disks but the target were successfully deleted by
@@ -3302 +3301 @@
         if (childrenToReparent.size() > 0)
         {
+            fSourceHasChildren = true;
             // Fix the parent UUID of the images which needs to be moved to
             // underneath target. The running machine has the images opened,
@@ -3407 +3407 @@
     }
 
-    /* If this is a backwards merge update the medium associated with the
-     * attachment, as the previously associated one is now deleted. */
-    if (!aMergeForward)
+    /* If this is a backwards merge of the only remaining snapshot (i.e. the
+     * source has no children) then update the medium associated with the
+     * attachment, as the previously associated one (source) is now deleted.
+     * Without the immediate update the VM could not continue running. */
+    if (!aMergeForward && !fSourceHasChildren)
     {
         AutoWriteLock attLock(pMediumAttachment COMMA_LOCKVAL_SRC_POS);