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

Timestamp:

Mar 22, 2010 2:19:40 PM (15 years ago)

Author:

vboxsync

Message:

Main: improve r59084 a bit

File:

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

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1586 +1586 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-#if 1 /** @todo Temporarily hacked so that it won't trigger lock validator errors
-       *        and deadlock. */
-    /* VirtualBox::saveSettings() needs a write lock and we access mParent & children() */
-    AutoWriteLock alock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
-    AutoMultiWriteLock2 alockGrossHack(&m->pVirtualBox->getMediaTreeLockHandle(), this->lockHandle() COMMA_LOCKVAL_SRC_POS);
-#else
-    /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock(m->pVirtualBox, this COMMA_LOCKVAL_SRC_POS);
-#endif
+    // we access mParent and members
+    AutoMultiWriteLock2 mlock(&m->pVirtualBox->getMediaTreeLockHandle(), this->lockHandle() COMMA_LOCKVAL_SRC_POS);
 
     switch (m->state)
@@ -1610 +1603 @@
         return S_OK;
     }
-
-#if 0 /** @todo temporary hack above. */
-    /* we access mParent & children() */
-    AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
-#endif
 
     /* cannot change the type of a differencing hard disk */
@@ -1653 +1641 @@
     m->type = aType;
 
-#if 1 /** @todo remove this gross hack! Just need to get this code working again. */
-    alockGrossHack.leave();
-#endif
-
-    HRESULT rc = m->pVirtualBox->saveSettings();
+    // saveSettings needs vbox lock
+    ComObjPtr<VirtualBox> pVirtualBox(m->pVirtualBox);
+    mlock.leave();
+    AutoWriteLock alock(m->pVirtualBox COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = pVirtualBox->saveSettings();
 
     return rc;