Changeset 38764 in vbox for trunk/src/VBox

Timestamp:

Sep 15, 2011 2:09:40 PM (13 years ago)

Author:

vboxsync

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

74046

Message:

Main/Medium+Machine: final lock order fixes

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImplCloneVM.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (2 diffs)

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

@@ -660 +660 @@
                         NULL);       /* pllRegistriesThatNeedSaving */
         if (FAILED(rc)) throw rc;
+
+        // need tree lock for createMediumLockList
+        AutoWriteLock treeLock(p->getVirtualBox()->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+
         MediumLockList *pMediumLockList(new MediumLockList());
         rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
@@ -668 +672 @@
         rc = pMediumLockList->Lock();
         if (FAILED(rc)) throw rc;
+
+        treeLock.release();
+
         /* this already registers the new diff image */
         rc = pParent->createDiffStorage(diff, MediumVariant_Standard,

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

@@ -1049 +1049 @@
     if (fForceNewUuid)
         unconst(m->uuidImage).create();
-    rc = queryInfo(fForceNewUuid /* fSetImageId */, false /* fSetParentId */);
+
+    {
+        // Medium::queryInfo needs write lock
+        AutoWriteLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+        rc = queryInfo(fForceNewUuid /* fSetImageId */, false /* fSetParentId */);
+    }
 
     if (SUCCEEDED(rc))
@@ -1955 +1960 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoMultiWriteLock2 alock(&m->pVirtualBox->getMediaTreeLockHandle(),
+                              this->lockHandle() COMMA_LOCKVAL_SRC_POS);
 
     switch (m->state)