Changeset 5235 in vbox for trunk

Timestamp:

Oct 11, 2007 12:23:04 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed another r24978 regression: Don't de-associate hard disks in outdated attachments of a snapshot machine object being normally uninitialized when discarding a snapshot.

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3651 +3651 @@
      * instance is uninitialized; SessionMachine instances refer to real
      * Machine hard disks). This is necessary for a clean re-initialization of
-     * the VM after successfully re-checking the accessibility state. */
+     * the VM after successfully re-checking the accessibility state. Note
+     * that in case of normal Machine or SnapshotMachine uninitialization (as
+     * a result of unregistering or discarding the snapshot), outdated hard
+     * disk attachments will already be uninitialized and deleted, so this
+     * code will not affect them. */
     if (mType == IsMachine || mType == IsSnapshotMachine)
     {
@@ -9972 +9976 @@
             LogFlowThisFunc (("Discarding the snapshot (reparenting children)...\n"));
 
+            /* It is important to uninitialize and delete all snapshot's hard
+             * disk attachments as they are no longer valid -- otherwise the
+             * code in Machine::uninitDataAndChildObjects() will mistakenly
+             * perform hard disk deassociation. */
+            for (HDData::HDAttachmentList::iterator it = sm->mHDData->mHDAttachments.begin();
+                 it != sm->mHDData->mHDAttachments.end();)
+            {
+                (*it)->uninit();
+                it = sm->mHDData->mHDAttachments.erase (it);
+            }
+
             ComObjPtr <Snapshot> parentSnapshot = aTask.snapshot->parent();