Changeset 15163 in vbox

Timestamp:

Dec 9, 2008 1:08:49 PM (16 years ago)

Author:

vboxsync

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

40570

Message:

Main: #3312: De-associate the implicit hard disk from the VM before its deletion on failure (to create snapshot, revert to current snapshot, etc). Fixes the problem of orphan diffs after falied operations.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -6911 +6911 @@
         if ((*it)->isImplicit())
         {
+            /* deassociate and mark for deletion */
+            rc = hd->detachFrom (mData->mUuid);
+            AssertComRC (rc);
             implicitAtts.push_back (*it);
             continue;
@@ -6924 +6927 @@
             rc = hd->detachFrom (mData->mUuid);
             AssertComRC (rc);
+            continue;
         }
     }
@@ -6929 +6933 @@
     /* rollback hard disk changes */
     mHDData.rollback();
+
+    MultiResult mrc (S_OK);
 
     /* delete unused implicit diffs */
@@ -6951 +6957 @@
             ComObjPtr <HardDisk2> hd = (*it)->hardDisk();
 
-            rc = hd->deleteStorageAndWait();
-
-            /// @todo NEWMEDIA report the error as a warning here. Note that
-            /// we cannot simply abort the rollback because parts of machine
-            /// data may have been already restored from backup and
-            /// overwrote the recent changes. The best we can do is to
-            /// deassociate the hard disk (to prevent the consistency) but
-            /// leave it undeleted.
-
-            if (FAILED (rc))
-            {
-                rc = hd->detachFrom (mData->mUuid);
-                AssertComRC (rc);
-            }
+            mrc = hd->deleteStorageAndWait();
         }
 
@@ -6975 +6968 @@
     }
 
-    return rc;
+    return mrc;
 }