Changeset 24458 in vbox

Timestamp:

Nov 6, 2009 4:02:24 PM (15 years ago)

Author:

vboxsync

Message:

Main: fix medium detachments when restoring snapshot, second try

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/MediumImpl.cpp

@@ -3189 +3189 @@
      * time when discard() is called, there must be no any attachments at all
      * (the code calling prepareDiscard() should detach). */
-    AssertReturn(    m->backRefs.size() == 1
-                  && !m->backRefs.front().inCurState
-                  && m->backRefs.front().llSnapshotIds.size() == 1,
-                 E_FAIL);
+    AssertReturn(m->backRefs.size() == 1, E_FAIL);
+    AssertReturn(!m->backRefs.front().inCurState, E_FAIL);
+    AssertReturn(m->backRefs.front().llSnapshotIds.size() == 1, E_FAIL);
 
     ComObjPtr<Medium> child = children().front();
@@ -4071 +4070 @@
 
     if (m->backRefs.size() != 0)
+    {
+        Utf8Str strMachines;
+        for (BackRefList::const_iterator it = m->backRefs.begin();
+            it != m->backRefs.end();
+            ++it)
+        {
+            const BackRef &b = *it;
+            if (strMachines.length())
+                strMachines.append(", ");
+            strMachines.append(b.machineId.toString().c_str());
+        }
+#ifdef DEBUG
+        dumpBackRefs();
+#endif
         return setError(VBOX_E_OBJECT_IN_USE,
-                        tr("Hard disk '%s' is attached to %d virtual machines"),
-                        m->strLocationFull.raw(), m->backRefs.size());
+                        tr("Cannot delete storage: hard disk '%s' is still attached to the following %d virtual machine(s): %s"),
+                        m->strLocationFull.c_str(),
+                        m->backRefs.size(),
+                        strMachines.c_str());
+    }
 
     HRESULT rc = canClose();

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1810 +1810 @@
             LogFlowThisFunc(("Detaching old current state in differencing image '%s'\n", pMedium->name().raw()));
 
-            // we "detach" the medium by removing the attachment object
-            // from the current machine data; saveSettings() below will then
+            // Normally we "detach" the medium by removing the attachment object
+            // from the current machine data; saveSettings() below would then
             // compare the current machine data with the one in the backup
-            // and actually call Medium::detachFrom()
+            // and actually call Medium::detachFrom(). But that works only half
+            // the time in our case so instead we force a detachment here:
+            // remove from machine data
             mMediaData->mAttachments.remove(pAttach);
+            // remove it from the backup or else saveSettings will try to detach
+            // it again and assert
+            mMediaData.backedUpData()->mAttachments.remove(pAttach);
+            // then clean up backrefs
+            pMedium->detachFrom(mData->mUuid);
 
             llDiffsToDelete.push_back(pMedium);