Changeset 24462 in vbox for trunk/src/VBox

Timestamp:

Nov 6, 2009 4:20:13 PM (15 years ago)

Author:

vboxsync

Message:

Main: fix deadlock discarding images

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -3306 +3306 @@
 
             hdFrom = this;
+
+            // deleteStorageAndWait calls unregisterWithVirtualBox which gets
+            // a write tree lock, so don't deadlock
+            treeLock.unlock();
+            alock.unlock();
 
             rc = deleteStorageAndWait(&aProgress);
@@ -4043 +4048 @@
      * it holds a mVirtualBox lock too of course). */
 
-    AutoWriteLock vboxLock(mVirtualBox);
-
-    AutoWriteLock alock(this);
+    AutoMultiWriteLock2 alock(mVirtualBox->lockHandle(), this->lockHandle());
 
     if (    !(m->formatObj->capabilities() & (   MediumFormatCapabilities_CreateDynamic