Changeset 28770 in vbox for trunk/src

Timestamp:

Apr 26, 2010 4:59:53 PM (15 years ago)

Author:

vboxsync

Message:

Main/Snapshot+Medium: fix a medium locking and medium state bug

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -3827 +3827 @@
 
         /* go to Deleting state, so that the medium is not actually locked */
-        rc = markForDeletion();
-        if (FAILED(rc))
-            throw rc;
+        if (m->state != MediumState_Deleting)
+        {
+            rc = markForDeletion();
+            if (FAILED(rc))
+                throw rc;
+        }
 
         /* Build the medium lock list. */

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -2436 +2436 @@
                 {
                     Assert(pMedium->getState() == MediumState_Deleting);
+                    /* No need to hold the lock any longer. */
+                    mLock.release();
                     rc = pMedium->deleteStorage(&aTask.pProgress,
                                                 true /* aWait */,