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

Timestamp:

May 27, 2013 11:56:50 AM (12 years ago)

Author:

vboxsync

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

86029

Message:

Main/Machine: fix medium lock list handling when creating implicit diffs, the update should be done in commitMedia

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (3 diffs)

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

@@ -2514 +2514 @@
             mHWData->mHWVirtExUXEnabled = !!aVal;
             break;
-    
+
         case HWVirtExPropertyType_LargePages:
             setModified(IsModified_MachineData);
@@ -10723 +10723 @@
             if (FAILED(rc)) throw rc;
 
-            rc = lockedMediaMap->Unlock();
-            AssertComRCThrowRC(rc);
-            alock.release();
-            rc = pMediumLockList->Append(diff, true);
-            alock.acquire();
-            AssertComRCThrowRC(rc);
-            alock.release();
-            rc = lockedMediaMap->Lock();
-            alock.acquire();
-            AssertComRCThrowRC(rc);
+            /* actual lock list update is done in Medium::commitMedia */
 
             rc = diff->addBackReference(mData->mUuid);
@@ -11367 +11358 @@
                 MediumLockList *pMediumLockList;
                 rc = mData->mSession.mLockedMedia.Get(pAttach, pMediumLockList);
-                AssertComRC(rc);
-                if (pMediumLockList)
+                if (RT_UNLIKELY(rc == VBOX_E_INVALID_OBJECT_STATE))
                 {
-                    rc = mData->mSession.mLockedMedia.Remove(pAttach);
+                    /* this happens for online snapshots, there the attachment
+                     * is changing, but only to a diff image created under
+                     * the old one, so there is no separate lock list */
+                    Assert(!pMediumLockList);
+                }
+                else
+                {
                     AssertComRC(rc);
+                    if (pMediumLockList)
+                    {
+                        rc = mData->mSession.mLockedMedia.Remove(pAttach);
+                        AssertComRC(rc);
+                    }
                 }
             }