Changeset 52168 in vbox

Timestamp:

Jul 24, 2014 1:43:46 PM (11 years ago)

Author:

vboxsync

Message:

Main/VirtualBox+Medium+Snapshot: fix lock inconsistency which crept into the previous fixes

Location:

trunk/src/VBox/Main/src-server

Files:

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

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

@@ -8286 +8286 @@
 
             if (FAILED(mrc))
-            {
-                treeLock.acquire();
                 /* break parent association on failure to register */
                 this->i_deparent();     // removes target from parent
-            }
         }
         else

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

@@ -3471 +3471 @@
         rc = mParent->i_registerMedium(pDeleteRec->mpTarget, &pDeleteRec->mpTarget, DeviceType_HardDisk, treeLock);
         AssertComRC(rc);
-        treeLock.acquire();
     }
     else

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

@@ -4251 +4251 @@
     }
 
+    // Restore the initial lock state, so that no unexpected lock changes are
+    // done by this method, which would need adjustments everywhere.
+    mediaTreeLock.acquire();
+
     return rc;
 }