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

Timestamp:

Apr 17, 2013 7:03:25 PM (12 years ago)

Author:

vboxsync

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

85092

Message:

Main/Machine: Add a newly attached medium to the lcoked media map during hotplugging or when the expert storage mgmt mode is enabled

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -4188 +4188 @@
 
     if (fHotplug || fSilent)
-        rc = onStorageDeviceChange(attachment, FALSE /* aRemove */, fSilent);
+    {
+        MediumLockList *pMediumLockList(new MediumLockList());
+
+        rc = medium->createMediumLockList(true /* fFailIfInaccessible */,
+                                          true /* fMediumLockWrite */,
+                                          NULL,
+                                          *pMediumLockList);
+        alock.acquire();
+        if (FAILED(rc))
+            delete pMediumLockList;
+        else
+        {
+            mData->mSession.mLockedMedia.Unlock();
+            alock.release();
+            rc = mData->mSession.mLockedMedia.Insert(attachment, pMediumLockList);
+            mData->mSession.mLockedMedia.Lock();
+            alock.acquire();
+        }
+        alock.release();
+
+        if (SUCCEEDED(rc))
+        {
+            rc = onStorageDeviceChange(attachment, FALSE /* aRemove */, fSilent);
+            /* Remove lock list in case of error. */
+            if (FAILED(rc))
+            {
+                mData->mSession.mLockedMedia.Unlock();
+                mData->mSession.mLockedMedia.Remove(attachment);
+                mData->mSession.mLockedMedia.Lock();
+            }
+        }
+    }
 
     mParent->saveModifiedRegistries();