Changeset 18206 in vbox

Timestamp:

Mar 24, 2009 4:44:37 PM (16 years ago)

Author:

vboxsync

Message:

Main: Improve fix for #3727 by handling case when oldimage != image.

Location:

trunk/src/VBox/Main

Files:

• DVDDriveImpl.cpp (modified) (2 diffs)
• FloppyDriveImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/DVDDriveImpl.cpp

@@ -587 +587 @@
                 }
             }
+
+            if (!oldData->image.isNull() &&
+                !oldData->image.equalsTo (m->image))
+            {
+                /* Reattach from the old image. */
+                HRESULT rc = oldData->image->attachTo(mParent->id(), mParent->snapshotId());
+                AssertComRC (rc);
+                if (Global::IsOnline (adep.machineState()))
+                {
+                    /* Lock from the old image. */
+                    rc = oldData->image->LockRead (NULL);
+                    AssertComRC (rc);
+                }
+            }
         }
 
@@ -671 +685 @@
     /* we need adep for the state check */
     Machine::AutoAnyStateDependency adep (mParent);
-    AssertComRCReturn (adep.rc(), false);
+    AssertComRCReturn (adep.rc(), E_FAIL);
 
     if (!m->image.isNull())

trunk/src/VBox/Main/FloppyDriveImpl.cpp

@@ -594 +594 @@
                 }
             }
+
+            if (!oldData->image.isNull() &&
+                !oldData->image.equalsTo (m->image))
+            {
+                /* Reattach from the old image. */
+                HRESULT rc = oldData->image->attachTo(mParent->id(), mParent->snapshotId());
+                AssertComRC (rc);
+                if (Global::IsOnline (adep.machineState()))
+                {
+                    /* Lock from the old image. */
+                    rc = oldData->image->LockRead (NULL);
+                    AssertComRC (rc);
+                }
+            }
+
         }
 
@@ -676 +691 @@
     /* we need adep for the state check */
     Machine::AutoAnyStateDependency adep (mParent);
-    AssertComRCReturn (adep.rc(), false);
+    AssertComRCReturn (adep.rc(), E_FAIL);
 
     if (!m->image.isNull())