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

Timestamp:

Nov 17, 2012 2:00:44 PM (12 years ago)

Author:

vboxsync

Message:

Fix attaching a hard disk by UUID through VBoxManage (4.2 regression, see public #11209)

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

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

@@ -1940 +1940 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+    Guid id(aLocation);
     ComObjPtr<Medium> pMedium;
 
@@ -1952 +1953 @@
     {
         case DeviceType_HardDisk:
-            rc = findHardDiskByLocation(aLocation,
-                                   false, /* aSetError */
-                                   &pMedium);
+            if (!id.isEmpty())
+                rc = findHardDiskById(id, false /* setError */, &pMedium);
+            else
+                rc = findHardDiskByLocation(aLocation,
+                                            false, /* aSetError */
+                                            &pMedium);
         break;