Changeset 99991 in vbox

Timestamp:

May 26, 2023 7:19:50 PM (20 months ago)

Author:

vboxsync

Message:

Main: reimplements resizeAndCloneTo fix. removes bypass. bugref:10090

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -18258 +18258 @@
   <interface
     name="IMedium" extends="$unknown"
-    uuid="ad47ad09-787b-44ab-b343-a082a3f2dfb1"
+    uuid="7d510820-a678-4730-a862-818dcd3fbed0"
     wsmap="managed"
     rest="managed"
@@ -19632 +19632 @@
           The specified cloning variant is not supported at the moment.
         </result>
-
-        <note>
-          Method will be moved to appropriate location at the next major API release.
-        </note>
       </desc>
 

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

@@ -3017 +3017 @@
                         ComPtr<IProgress> &aProgress)
 {
-    /** @todo r=jack: Remove redundancy. Call Medium::resizeAndCloneTo. */
-
-    /** @todo r=klaus The code below needs to be double checked with regard
-     * to lock order violations, it probably causes lock order issues related
-     * to the AutoCaller usage. */
-    ComAssertRet(aTarget != this, E_INVALIDARG);
-
-    IMedium *aT = aTarget;
-    ComObjPtr<Medium> pTarget = static_cast<Medium*>(aT);
-    ComObjPtr<Medium> pParent;
-    if (aParent)
-    {
-        IMedium *aP = aParent;
-        pParent = static_cast<Medium*>(aP);
-    }
-
-    HRESULT hrc = S_OK;
-    ComObjPtr<Progress> pProgress;
-    Medium::Task *pTask = NULL;
-
-    try
-    {
-        // locking: we need the tree lock first because we access parent pointers
-        // and we need to write-lock the media involved
-        uint32_t    cHandles    = 3;
-        LockHandle* pHandles[4] = { &m->pVirtualBox->i_getMediaTreeLockHandle(),
-                                    this->lockHandle(),
-                                    pTarget->lockHandle() };
-        /* Only add parent to the lock if it is not null */
-        if (!pParent.isNull())
-            pHandles[cHandles++] = pParent->lockHandle();
-        AutoWriteLock alock(cHandles,
-                            pHandles
-                            COMMA_LOCKVAL_SRC_POS);
-
-        if (    pTarget->m->state != MediumState_NotCreated
-            &&  pTarget->m->state != MediumState_Created)
-            throw pTarget->i_setStateError();
-
-        /* Build the source lock list. */
-        MediumLockList *pSourceMediumLockList(new MediumLockList());
-        alock.release();
-        hrc = i_createMediumLockList(true /* fFailIfInaccessible */,
-                                     NULL /* pToLockWrite */,
-                                     false /* fMediumLockWriteAll */,
-                                     NULL,
-                                     *pSourceMediumLockList);
-        alock.acquire();
-        if (FAILED(hrc))
-        {
-            delete pSourceMediumLockList;
-            throw hrc;
-        }
-
-        /* Build the target lock list (including the to-be parent chain). */
-        MediumLockList *pTargetMediumLockList(new MediumLockList());
-        alock.release();
-        hrc = pTarget->i_createMediumLockList(true /* fFailIfInaccessible */,
-                                              pTarget /* pToLockWrite */,
-                                              false /* fMediumLockWriteAll */,
-                                              pParent,
-                                              *pTargetMediumLockList);
-        alock.acquire();
-        if (FAILED(hrc))
-        {
-            delete pSourceMediumLockList;
-            delete pTargetMediumLockList;
-            throw hrc;
-        }
-
-        alock.release();
-        hrc = pSourceMediumLockList->Lock();
-        alock.acquire();
-        if (FAILED(hrc))
-        {
-            delete pSourceMediumLockList;
-            delete pTargetMediumLockList;
-            throw setError(hrc,
-                           tr("Failed to lock source media '%s'"),
-                           i_getLocationFull().c_str());
-        }
-        alock.release();
-        hrc = pTargetMediumLockList->Lock();
-        alock.acquire();
-        if (FAILED(hrc))
-        {
-            delete pSourceMediumLockList;
-            delete pTargetMediumLockList;
-            throw setError(hrc,
-                           tr("Failed to lock target media '%s'"),
-                           pTarget->i_getLocationFull().c_str());
-        }
-
-        pProgress.createObject();
-        hrc = pProgress->init(m->pVirtualBox,
-                              static_cast <IMedium *>(this),
-                              BstrFmt(tr("Creating clone medium '%s'"), pTarget->m->strLocationFull.c_str()).raw(),
-                              TRUE /* aCancelable */);
-        if (FAILED(hrc))
-        {
-            delete pSourceMediumLockList;
-            delete pTargetMediumLockList;
-            throw hrc;
-        }
-
-        ULONG mediumVariantFlags = 0;
-
-        if (aVariant.size())
-        {
-            for (size_t i = 0; i < aVariant.size(); i++)
-                mediumVariantFlags |= (ULONG)aVariant[i];
-        }
-
-        if (mediumVariantFlags & MediumVariant_Formatted)
-        {
-            delete pSourceMediumLockList;
-            delete pTargetMediumLockList;
-            throw setError(VBOX_E_NOT_SUPPORTED,
-                           tr("Medium variant 'formatted' applies to floppy images only"));
-        }
-
-        /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::CloneTask(this, pProgress, pTarget,
-                                      (MediumVariant_T)mediumVariantFlags,
-                                      pParent, UINT32_MAX, UINT32_MAX,
-                                      pSourceMediumLockList, pTargetMediumLockList);
-        hrc = pTask->hrc();
-        AssertComRC(hrc);
-        if (FAILED(hrc))
-            throw hrc;
-
-        if (pTarget->m->state == MediumState_NotCreated)
-            pTarget->m->state = MediumState_Creating;
-    }
-    catch (HRESULT hrcXcpt)
-    {
-        hrc = hrcXcpt;
-    }
-
-    if (SUCCEEDED(hrc))
-    {
-        hrc = pTask->createThread();
-        pTask = NULL;
-        if (SUCCEEDED(hrc))
-            pProgress.queryInterfaceTo(aProgress.asOutParam());
-    }
-    else if (pTask != NULL)
-        delete pTask;
-
-    return hrc;
+    return resizeAndCloneTo(aTarget, 0, aVariant, aParent, aProgress);
 }
 
@@ -3232 +3083 @@
         return hrc;
 
+    /** @todo r=jack: check below block  for correct lock handling */
     /* If target does not exist, handle resize. */
     if (pTarget->m->state != MediumState_NotCreated && aLogicalSize > 0)