Changeset 23763 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 14, 2009 2:39:02 PM (15 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: fix medium backref handling for floppy/dvd media

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2453 +2453 @@
                         aDevice, aControllerPort, aControllerName);
 
-    ComObjPtr<Medium> hd = pAttach->medium();
 
     if (pAttach->isImplicit())
@@ -2472 +2471 @@
         alock.leave();
 
+        ComObjPtr<Medium> hd = pAttach->medium();
         rc = hd->deleteStorageAndWait();
 
@@ -2578 +2578 @@
     if (SUCCEEDED(rc))
     {
+
+        mMediaData.backup();
+        /* The backup operation makes the pAttach reference point to the
+         * old settings. Re-get the correct reference. */
+        pAttach = findAttachment(mMediaData->mAttachments,
+                                 aControllerName,
+                                 aControllerPort,
+                                 aDevice);
         AutoWriteLock attLock(pAttach);
+        if (!medium.isNull())
+            medium->attachTo(mData->mUuid);
         pAttach->updateMedium(medium, false /* aImplicit */);
     }
@@ -5573 +5583 @@
         CheckComRCBreakRC(rc);
 
-        if (dev.deviceType == DeviceType_HardDisk)
-        {
-            /* associate the hard disk with this machine and snapshot */
-            if (mType == IsSnapshotMachine)
-                rc = medium->attachTo(mData->mUuid, *aSnapshotId);
-            else
-                rc = medium->attachTo(mData->mUuid);
-            AssertComRCBreakRC (rc);
-        }
+        /* associate the medium with this machine and snapshot */
+        if (mType == IsSnapshotMachine)
+            rc = medium->attachTo(mData->mUuid, *aSnapshotId);
+        else
+            rc = medium->attachTo(mData->mUuid);
+        AssertComRCBreakRC (rc);
 
         /* backup mMediaData to let registeredInit() properly rollback on failure