Changeset 38420 in vbox

Timestamp:

Aug 11, 2011 2:30:48 PM (13 years ago)

Author:

vboxsync

Message:

Main-Clone: use new Medium::cloneToEx method

Location:

trunk/src/VBox/Main

Files:

• include/MediumImpl.h (modified) (1 diff)
• src-server/MachineImplCloneVM.cpp (modified) (9 diffs)
• src-server/MediumImpl.cpp (modified) (3 diffs)

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

@@ -264 +264 @@
 
     HRESULT cloneToEx(const ComObjPtr<Medium> &aTarget, ULONG aVariant,
-                      const ComObjPtr<Medium> &aParent, const ComObjPtr<Progress> &aProgress,
+                      const ComObjPtr<Medium> &aParent, IProgress **aProgress,
                       uint32_t idxSrcImageSame, uint32_t idxDstImageSame);
 

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

@@ -39 +39 @@
     Utf8Str                 strBaseName;
     ComPtr<IMedium>         pMedium;
+    uint32_t                uIdx;
     ULONG                   uWeight;
 } MEDIUMTASK;
@@ -278 +279 @@
 
             MEDIUMTASK mt;
+            mt.uIdx = UINT32_MAX; /* No read/write optimization possible. */
 
             /* Save the base name. */
@@ -386 +388 @@
 
                 MEDIUMTASK mt;
+                mt.uIdx    = UINT32_MAX;
                 mt.pMedium = pSrcMedium;
                 mt.uWeight = (lSize + _1M - 1) / _1M;
@@ -400 +403 @@
         rc = addSaveState(machine, uCount, uTotalWeight);
         if (FAILED(rc)) return rc;
+    }
+    /* Build up the index list of the image chain. Unfortunately we can't do
+     * that in the previous loop, cause there we go from child -> parent and
+     * didn't know how many are between. */
+    for (size_t i = 0; i < llMedias.size(); ++i)
+    {
+        uint32_t uIdx = 0;
+        MEDIUMTASKCHAIN &mtc = llMedias.at(i);
+        for (size_t a = mtc.chain.size(); a > 0; --a)
+            mtc.chain[a - 1].uIdx = ++uIdx;
     }
 #ifdef DEBUG_poetzsch
@@ -509 +522 @@
                 /* Save the current medium, for later cloning. */
                 MEDIUMTASK mt;
+                mt.uIdx    = UINT32_MAX;
                 mt.pMedium = pSrcMedium;
                 mt.uWeight = (lSize + _1M - 1) / _1M;
@@ -525 +539 @@
         rc = addSaveState(machine, uCount, uTotalWeight);
         if (FAILED(rc)) return rc;
+    }
+    /* Build up the index list of the image chain. Unfortunately we can't do
+     * that in the previous loop, cause there we go from child -> parent and
+     * didn't know how many are between. */
+    for (size_t i = 0; i < llMedias.size(); ++i)
+    {
+        uint32_t uIdx = 0;
+        MEDIUMTASKCHAIN &mtc = llMedias.at(i);
+        for (size_t a = mtc.chain.size(); a > 0; --a)
+            mtc.chain[a - 1].uIdx = ++uIdx;
     }
 
@@ -1002 +1026 @@
             const MEDIUMTASKCHAIN &mtc = d->llMedias.at(i);
             ComObjPtr<Medium> pNewParent;
+            uint32_t uSrcParentIdx = UINT32_MAX;
+            uint32_t uTrgParentIdx = UINT32_MAX;
             for (size_t a = mtc.chain.size(); a > 0; --a)
             {
@@ -1134 +1160 @@
                         /* Do the disk cloning. */
                         ComPtr<IProgress> progress2;
-                        rc = pMedium->CloneTo(pTarget,
-                                              srcVar,
-                                              pNewParent,
-                                              progress2.asOutParam());
+
+                        ComObjPtr<Medium> pLMedium = static_cast<Medium*>((IMedium*)pMedium);
+                        rc = pLMedium->cloneToEx(pTarget,
+                                                 srcVar,
+                                                 pNewParent,
+                                                 progress2.asOutParam(),
+                                                 uSrcParentIdx,
+                                                 uTrgParentIdx);
                         if (FAILED(rc)) throw rc;
 
@@ -1177 +1207 @@
                     }
                 }
+                /* Save the current source medium index as the new parent
+                 * medium index. */
+                uSrcParentIdx = mt.uIdx;
+                /* Simply increase the target index. */
+                ++uTrgParentIdx;
             }
 

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

@@ -5109 +5109 @@
  */
 HRESULT Medium::cloneToEx(const ComObjPtr<Medium> &aTarget, ULONG aVariant,
-                          const ComObjPtr<Medium> &aParent, const ComObjPtr<Progress> &aProgress,
+                          const ComObjPtr<Medium> &aParent, IProgress **aProgress,
                           uint32_t idxSrcImageSame, uint32_t idxDstImageSame)
 {
     CheckComArgNotNull(aTarget);
-    AssertReturn(!aProgress.isNull(), E_INVALIDARG);
+    CheckComArgOutPointerValid(aProgress);
     ComAssertRet(aTarget != this, E_INVALIDARG);
 
@@ -5191 +5191 @@
 
         /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::CloneTask(this, aProgress, aTarget,
+        pTask = new Medium::CloneTask(this, pProgress, aTarget,
                                       (MediumVariant_T)aVariant,
                                       aParent, idxSrcImageSame,
@@ -5207 +5207 @@
 
     if (SUCCEEDED(rc))
+    {
         rc = startThread(pTask);
+
+        if (SUCCEEDED(rc))
+            pProgress.queryInterfaceTo(aProgress);
+    }
     else if (pTask != NULL)
         delete pTask;