Changeset 44395 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

Jan 26, 2013 7:52:47 PM (12 years ago)

Author:

vboxsync

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

83369

Message:

Main/SnapshotImpl: Select merge direction based on the image size

File:

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

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -2455 +2455 @@
                 // base disk. Here we need then to update the attachment that
                 // refers to the child and have it point to the parent instead
-                Assert(pHD->getParent().isNull());
                 Assert(pHD->getChildren().size() == 1);
 
@@ -3005 +3004 @@
     else
     {
-        /* forward merge */
-        aSource = aHD;
-        aTarget = pChild;
+        /* Determine best merge direction. */
+        bool fMergeForward = true;
+
+        childLock.release();
+        alock.release();
+        HRESULT rc = aHD->queryPreferredMergeDirection(pChild, fMergeForward);
+        alock.acquire();
+        childLock.acquire();
+
+        if (FAILED(rc) && rc != E_FAIL)
+            return rc;
+
+        if (fMergeForward)
+        {
+            aSource = aHD;
+            aTarget = pChild;
+            LogFlowFunc(("Forward merging selected\n"));
+        }
+        else
+        {
+            aSource = pChild;
+            aTarget = aHD;
+            LogFlowFunc(("Backward merging selected\n"));
+        }
     }