Changeset 28872 in vbox

Timestamp:

Apr 28, 2010 2:54:03 PM (15 years ago)

Author:

vboxsync

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

60802

Message:

Main/Medium: new helper method for fixing up parent UUIDs of children moved around by merging, make diff reset rely on documented VBoxHDD behavior by opening the entire medium chain, minor bugfixing to get the reported image sizes in the GUI right, fixing the parameters of an error message to print the right image name

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (8 diffs)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -4949 +4949 @@
 
 /**
+ * Fix the parent UUID of all children to point to this medium as their
+ * parent.
+ */
+HRESULT Medium::fixParentUuidOfChildren(const MediaList &childrenToReparent)
+{
+    MediumLockList mediumLockList;
+    HRESULT rc = createMediumLockList(false, this, mediumLockList);
+    AssertComRCReturnRC(rc);
+
+    try
+    {
+        PVBOXHDD hdd;
+        int vrc = VDCreate(m->vdDiskIfaces, &hdd);
+        ComAssertRCThrow(vrc, E_FAIL);
+
+        try
+        {
+            MediumLockList::Base::iterator lockListBegin =
+                mediumLockList.GetBegin();
+            MediumLockList::Base::iterator lockListEnd =
+                mediumLockList.GetEnd();
+            for (MediumLockList::Base::iterator it = lockListBegin;
+                 it != lockListEnd;
+                 ++it)
+            {
+                MediumLock &mediumLock = *it;
+                const ComObjPtr<Medium> &pMedium = mediumLock.GetMedium();
+                AutoReadLock(pMedium COMMA_LOCKVAL_SRC_POS);
+
+                // open the image
+                vrc = VDOpen(hdd,
+                             pMedium->m->strFormat.c_str(),
+                             pMedium->m->strLocationFull.c_str(),
+                             VD_OPEN_FLAGS_READONLY,
+                             pMedium->m->vdDiskIfaces);
+                if (RT_FAILURE(vrc))
+                    throw vrc;
+            }
+
+            for (MediaList::const_iterator it = childrenToReparent.begin();
+                 it != childrenToReparent.end();
+                 ++it)
+            {
+                /* VD_OPEN_FLAGS_INFO since UUID is wrong yet */
+                vrc = VDOpen(hdd,
+                             (*it)->m->strFormat.c_str(),
+                             (*it)->m->strLocationFull.c_str(),
+                             VD_OPEN_FLAGS_INFO,
+                             (*it)->m->vdDiskIfaces);
+                if (RT_FAILURE(vrc))
+                    throw vrc;
+
+                vrc = VDSetParentUuid(hdd, VD_LAST_IMAGE, m->id);
+                if (RT_FAILURE(vrc))
+                    throw vrc;
+
+                vrc = VDClose(hdd, false /* fDelete */);
+                if (RT_FAILURE(vrc))
+                    throw vrc;
+
+                (*it)->UnlockWrite(NULL);
+            }
+        }
+        catch (HRESULT aRC) { rc = aRC; }
+        catch (int aVRC)
+        {
+            throw setError(E_FAIL,
+                            tr("Could not update medium UUID references to parent '%s' (%s)"),
+                            m->strLocationFull.raw(),
+                            vdError(aVRC).raw());
+        }
+
+        VDDestroy(hdd);
+    }
+    catch (HRESULT aRC) { rc = aRC; }
+
+    return rc;
+}
+
+/**
  * Runs Medium::Task::handler() on the current thread instead of creating
  * a new one.
@@ -5217 +5297 @@
                                 targetLocation.raw(), vdError(vrc).raw());
 
-            size = VDGetFileSize(hdd, 1);
-            logicalSize = VDGetSize(hdd, 1) / _1M;
+            size = VDGetFileSize(hdd, VD_LAST_IMAGE);
+            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE) / _1M;
         }
         catch (HRESULT aRC) { rc = aRC; }
@@ -5421 +5501 @@
                             throw vrc;
 
-                        vrc = VDSetParentUuid(hdd, 1,
+                        vrc = VDSetParentUuid(hdd, VD_LAST_IMAGE,
                                               pTarget->m->id);
                         if (RT_FAILURE(vrc))
@@ -5440 +5520 @@
             throw setError(E_FAIL,
                             tr("Could not merge the hard disk '%s' to '%s'%s"),
-                            m->strLocationFull.raw(), m->strLocationFull.raw(),
+                            m->strLocationFull.raw(),
+                            pTarget->m->strLocationFull.raw(),
                             vdError(aVRC).raw());
         }
@@ -5501 +5582 @@
 
                     pMedium->deparent();  // removes pMedium from source
-                    pTarget->m->llChildren.push_back(pMedium);
-                    pMedium->m->pParent = pTarget;
+                    pMedium->setParent(pTarget);
                 }
             }
@@ -5748 +5828 @@
                                     targetLocation.raw(), vdError(vrc).raw());
 
-                size = VDGetFileSize(targetHdd, 0);
-                logicalSize = VDGetSize(targetHdd, 0) / _1M;
+                size = VDGetFileSize(targetHdd, VD_LAST_IMAGE);
+                logicalSize = VDGetSize(targetHdd, VD_LAST_IMAGE) / _1M;
             }
             catch (HRESULT aRC) { rc = aRC; }
@@ -5943 +6023 @@
         try
         {
+            /* Open all hard disk images in the target chain but the last. */
+            MediumLockList::Base::const_iterator targetListBegin =
+                task.mpMediumLockList->GetBegin();
+            MediumLockList::Base::const_iterator targetListEnd =
+                task.mpMediumLockList->GetEnd();
+            for (MediumLockList::Base::const_iterator it = targetListBegin;
+                 it != targetListEnd;
+                 ++it)
+            {
+                const MediumLock &mediumLock = *it;
+                const ComObjPtr<Medium> &pMedium = mediumLock.GetMedium();
+
+                AutoReadLock alock(pMedium COMMA_LOCKVAL_SRC_POS);
+
+                /* sanity check */
+                Assert(pMedium->m->state == MediumState_LockedRead);
+
+                /* Open all images in appropriate mode. */
+                vrc = VDOpen(hdd,
+                             pMedium->m->strFormat.c_str(),
+                             pMedium->m->strLocationFull.c_str(),
+                             VD_OPEN_FLAGS_READONLY,
+                             pMedium->m->vdDiskIfaces);
+                if (RT_FAILURE(vrc))
+                    throw setError(E_FAIL,
+                                   tr("Could not open the hard disk storage unit '%s'%s"),
+                                   pMedium->m->strLocationFull.raw(),
+                                   vdError(vrc).raw());
+
+                /* Done when we hit the image which should be reset */
+                if (pMedium == this)
+                    break;
+            }
+
             /* first, delete the storage unit */
-            vrc = VDOpen(hdd,
-                         format.c_str(),
-                         location.c_str(),
-                         VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO,
-                         m->vdDiskIfaces);
-            if (RT_SUCCESS(vrc))
-                vrc = VDClose(hdd, true /* fDelete */);
-
+            vrc = VDClose(hdd, true /* fDelete */);
             if (RT_FAILURE(vrc))
                 throw setError(E_FAIL,
@@ -5984 +6091 @@
                                 location.raw(), vdError(vrc).raw());
 
-            size = VDGetFileSize(hdd, 1);
-            logicalSize = VDGetSize(hdd, 1) / _1M;
+            size = VDGetFileSize(hdd, VD_LAST_IMAGE);
+            logicalSize = VDGetSize(hdd, VD_LAST_IMAGE) / _1M;
         }
         catch (HRESULT aRC) { rc = aRC; }

trunk/src/VBox/Main/include/MediumImpl.h

@@ -219 +219 @@
                        MediumLockList *aMediumLockList);
 
+    HRESULT fixParentUuidOfChildren(const MediaList &childrenToReparent);
+
     /** Returns a preferred format for a differencing hard disk. */
     Bstr preferredDiffFormat();