Changeset 24354 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2009 7:24:09 PM (15 years ago)

Author:

vboxsync

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

54377

Message:

Main: deleteSnapshot() fixes; should mostly work now

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -6440 +6440 @@
         if (    mData->mMachineState == MachineState_Saved
              || mData->mMachineState == MachineState_Restoring
+                // when deleting a snapshot we may or may not have a saved state in the current state,
+                // so let's not assert here please
+             || (    (mData->mMachineState == MachineState_DeletingSnapshot)
+                  && (!mSSData->mStateFilePath.isEmpty())
+                )
            )
         {

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -2111 +2111 @@
                 Assert(pAttach->medium());
                 ComObjPtr<Medium> pHD = pAttach->medium();
-                AutoReadLock mlock(pHD);
+                // do not lock, prepareDiscared() has a write lock which will hang otherwise
 
                 Medium::MergeChain *chain = NULL;
@@ -2292 +2292 @@
     }
 
-    if (FAILED(rc))
-    {
-        /* saveSettings() below needs a VirtualBox write lock and we need to
-         * leave this object's lock to do this to follow the {parent-child}
-         * locking rule. This is the last chance to do that while we are
-         * still in a protective state which allows us to temporarily leave
-         * the lock */
-        alock.unlock();
-        AutoWriteLock vboxLock(mParent);
-        alock.lock();
-
-        /* preserve existing error info */
+    alock.unlock();
+
+    // whether we were successful or not, we need to set the machine
+    // state and save the machine settings;
+    {
+        // preserve existing error info so that the result can
+        // be properly reported to the progress object below
         ErrorInfoKeeper eik;
 
-        /* restore the machine state */
+        // restore the machine state that was saved when the
+        // task was started
         setMachineState(aTask.machineStateBackup);
         updateMachineStateOnClient();
 
         if (settingsChanged)
+        {
+            // saveSettings needs VirtualBox write lock in addition to our own
+            // (parent -> child locking order!)
+            AutoWriteLock vboxLock(mParent);
+            alock.lock();
+
             saveSettings(SaveS_InformCallbacksAnyway);
-
-        /* set the result (this will try to fetch current error info on failure) */
-        aTask.pProgress->notifyComplete(rc);
-    }
+        }
+    }
+
+    // report the result (this will try to fetch current error info on failure)
+    aTask.pProgress->notifyComplete(rc);
 
     if (SUCCEEDED(rc))