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

Timestamp:

Nov 10, 2009 4:44:42 PM (15 years ago)

Author:

vboxsync

Message:

Main/MachineImpl: change the dvd/floppy mounting code so that the backref info is updated immediately, including corresponding rollback handling

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2832 +2832 @@
     Guid id(aId);
     ComObjPtr<Medium> medium;
-    switch (pAttach->type())
+    DeviceType_T mediumType = pAttach->type();
+    switch (mediumType)
     {
         case DeviceType_DVD:
@@ -2901 +2902 @@
                                  aDevice);
         AutoWriteLock attLock(pAttach);
+        /* For non-hard disk media, detach straight away. */
+        if (mediumType != DeviceType_HardDisk && !oldmedium.isNull())
+            oldmedium->detachFrom(mData->mUuid);
         if (!medium.isNull())
             medium->attachTo(mData->mUuid);
@@ -2923 +2927 @@
             return rc;
         AutoWriteLock attLock(pAttach);
+        /* For non-hard disk media, re-attach straight away. */
+        if (mediumType != DeviceType_HardDisk && !oldmedium.isNull())
+            oldmedium->attachTo(mData->mUuid);
         pAttach->updateMedium(oldmedium, false /* aImplicit */);
     }
@@ -3940 +3947 @@
     int rc = SSMR3Open(pStateFilePath->raw(), 0 /*fFlags*/, &pSSM);
     if (RT_SUCCESS(rc))
-    { 
+    {
         uint32_t uVersion;
         rc = SSMR3Seek(pSSM, "DisplayScreenshot", 1100 /*iInstance*/, &uVersion);
@@ -7706 +7713 @@
         {
             MediumAttachment *pAttach = *it;
-
             Medium* pMedium = pAttach->medium();
 
-            if (pMedium)
+            /* Detach only hard disks, since DVD/floppy media is detached
+             * instantly in MountMedium. */
+            if (pAttach->type() == DeviceType_HardDisk && pMedium)
             {
                 LogFlowThisFunc(("detaching medium '%s' from machine\n", pMedium->name().raw()));
@@ -7745 +7753 @@
              ++it)
         {
+            MediumAttachment *pAttach = *it;
+            /* Fix up the backrefs for DVD/floppy media. */
+            if (pAttach->type() != DeviceType_HardDisk)
+            {
+                Medium* pMedium = pAttach->medium();
+                if (pMedium)
+                {
+                    rc = pMedium->detachFrom(mData->mUuid);
+                    AssertComRC(rc);
+                }
+            }
+
             (*it)->rollback();
+
+            pAttach = *it;
+            /* Fix up the backrefs for DVD/floppy media. */
+            if (pAttach->type() != DeviceType_HardDisk)
+            {
+                Medium* pMedium = pAttach->medium();
+                if (pMedium)
+                {
+                    rc = pMedium->attachTo(mData->mUuid);
+                    AssertComRC(rc);
+                }
+            }
         }