Changeset 28873 in vbox

Timestamp:

Apr 28, 2010 2:55:35 PM (15 years ago)

Author:

vboxsync

Message:

Main/Snapshot+Console: implement reparenting children as part of a live merge, and remove the corresponding blockers in the code which prevented deleting the first snapshot

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4291 +4291 @@
     int vrc = VINF_SUCCESS;
     PVM pVM = mpVM;
-
-/// @todo handling the list of children to reparent is not yet done, get out
-    com::SafeIfaceArray<IMedium> sfaToReparent(ComSafeArrayInArg(aChildrenToReparent));
-    if (sfaToReparent.size() > 0)
-        return setError(E_NOTIMPL,
-                        tr("Cannot do online merging yet which involves adjusting the UUID of dependent media."));
 
     /* We will need to release the lock before doing the actual merge */

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -2492 +2492 @@
 // SessionMachine::FinishOnlineMergeMedium can't handle reparenting yet, block
 // here. Can be removed step by step.
-                    if (!it->mfMergeForward)
+                    if (!it->mfMergeForward && it->mChildrenToReparent.size() == 0)
                         throw setError(E_NOTIMPL,
                                        tr("Snapshot '%s' of the machine '%ls' cannot be deleted while a VM is running, as this case is not implemented yet. You can delete the snapshot when the VM is powered off"),
@@ -3160 +3160 @@
         targetChild->deparent();
 
-        // reparent source's children and disconnect the deleted
-        // branch at the younger end
+        // Update parent UUIDs of the source's children, reparent them and
+        // disconnect the deleted branch at the younger end
         com::SafeIfaceArray<IMedium> childrenToReparent(ComSafeArrayInArg(aChildrenToReparent));
         if (childrenToReparent.size() > 0)
         {
-/// @todo this is NOT fully working, the image open/parent change is missing.
-// See Medium::taskMergeHandler. Should be safe to add, as the VM is paused
-// right now. Should not get here, check in Console::onlineMergeMedium.
-            AssertFailedReturn(E_FAIL);
+            // Fix the parent UUID of the images which needs to be moved to
+            // underneath target. The running machine has the images opened,
+            // but only for reading since the VM is paused. If anything fails
+            // we must continue. The worst possible result is that the images
+            // need manual fixing via VBoxManage to adjust the parent UUID.
+            MediaList toReparent;
+            for (size_t i = 0; i < childrenToReparent.size(); i++)
+            {
+                Medium *pMedium = static_cast<Medium *>(childrenToReparent[i]);
+                toReparent.push_back(pMedium);
+            }
+            pTarget->fixParentUuidOfChildren(toReparent);
+
             // obey {parent,child} lock order
             AutoWriteLock sourceLock(pSource COMMA_LOCKVAL_SRC_POS);