Changeset 37604 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 23, 2011 8:38:23 AM (13 years ago)

Author:

vboxsync

Message:

Main-CloneVM: needs tree lock

File:

• trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (modified) (4 diffs)

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

@@ -621 +621 @@
                     if (FAILED(rc)) throw rc;
 
+                    srcLock.release();
                     /* Do the disk cloning. */
                     ComPtr<IProgress> progress2;
@@ -630 +631 @@
 
                     /* Wait until the asynchrony process has finished. */
-                    srcLock.release();
                     rc = d->pProgress->WaitForAsyncProgressCompletion(progress2);
                     srcLock.acquire();
@@ -657 +657 @@
                     map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pTarget));
                     /* Global register the new harddisk */
-                    rc = p->mParent->registerHardDisk(pTarget, NULL /* pllRegistriesThatNeedSaving */);
-                    if (FAILED(rc)) return rc;
+                    {
+                        AutoWriteLock tlock(p->mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+                        rc = p->mParent->registerHardDisk(pTarget, NULL /* pllRegistriesThatNeedSaving */);
+                        if (FAILED(rc)) return rc;
+                    }
                     /* This medium becomes the parent of the next medium in the
                      * chain. */
@@ -697 +700 @@
                 newMedias.append(diff);
                 /* Global register the new harddisk */
-                rc = p->mParent->registerHardDisk(diff, NULL /* pllRegistriesThatNeedSaving */);
-                if (FAILED(rc)) return rc;
+                {
+                    AutoWriteLock tlock(p->mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+                    rc = p->mParent->registerHardDisk(diff, NULL /* pllRegistriesThatNeedSaving */);
+                    if (FAILED(rc)) return rc;
+                }
                 /* This medium becomes the parent of the next medium in the
                  * chain. */