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

Timestamp:

Jan 26, 2010 11:14:03 AM (15 years ago)

Author:

vboxsync

Message:

Main: fix assertion and locking order violation registering ISO/RAW images

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2984 +2984 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    // we're calling host methods for getting DVD and floppy drives so lock host first
+    AutoMultiWriteLock2 alock(mParent->host(), this COMMA_LOCKVAL_SRC_POS);
 
     ComObjPtr<MediumAttachment> pAttach = findAttachment(mMediaData->mAttachments,

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1438 +1438 @@
 
 /** @note Doesn't lock anything. */
-STDMETHODIMP VirtualBox::OpenDVDImage (IN_BSTR aLocation, IN_BSTR aId,
-                                       IMedium **aDVDImage)
+STDMETHODIMP VirtualBox::OpenDVDImage(IN_BSTR aLocation, IN_BSTR aId,
+                                      IMedium **aDVDImage)
 {
     CheckComArgStrNotEmptyOrNull(aLocation);
@@ -1456 +1456 @@
     ComObjPtr<Medium> image;
     image.createObject();
-    rc = image->init (this, aLocation, Medium::OpenReadOnly, DeviceType_DVD, true, id, false, Guid());
+    rc = image->init(this, aLocation, Medium::OpenReadOnly, DeviceType_DVD, true, id, false, Guid());
     if (SUCCEEDED(rc))
     {
+        AutoWriteLock treeLock(getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         bool fNeedsSaveSettings = false;
         rc = registerImage(image, DeviceType_DVD, &fNeedsSaveSettings);
+        treeLock.release();
 
         if (SUCCEEDED(rc))
@@ -1533 +1535 @@
     if (SUCCEEDED(rc))
     {
+        AutoWriteLock treeLock(getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
         bool fNeedsSaveSettings = false;
         rc = registerImage(image, DeviceType_Floppy, &fNeedsSaveSettings);
+        treeLock.release();
 
         if (SUCCEEDED(rc))