Changeset 35608 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jan 18, 2011 2:19:31 PM (14 years ago)

Author:

vboxsync

Message:

Main: silently ignore removable media that cannot be found when loading machine settings XML

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -7540 +7540 @@
                 }
                 else
-                    rc = mParent->findRemoveableMedium(dev.deviceType, dev.uuid, false /* fRefresh */, medium);
-                if (FAILED(rc))
-                    return rc;
+                    mParent->findRemoveableMedium(dev.deviceType,
+                                                  dev.uuid,
+                                                  false /* fRefresh */,
+                                                  false /* aSetError */,
+                                                  medium);
+                        // note: do NOT fail if a removeable medium cannot be found, silently ignore the error completely
             break;
 

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -2835 +2835 @@
                                          const Guid &uuid,
                                          bool fRefresh,
+                                         bool aSetError,
                                          ComObjPtr<Medium> &pMedium)
 {
@@ -2851 +2852 @@
     if (rc == VBOX_E_OBJECT_NOT_FOUND)
                 // then search for an image with that UUID
-        rc = findDVDOrFloppyImage(mediumType, &uuid, Utf8Str::Empty, true /* aSetError */, &pMedium);
+        rc = findDVDOrFloppyImage(mediumType, &uuid, Utf8Str::Empty, aSetError, &pMedium);
 
     return rc;