Changeset 31615 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Aug 12, 2010 6:12:39 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64743

Message:

Main: Implemenation of per-machine media registries; VirtualBox::openMedium() no longer adds media to the global registry, instead a media are stored in a machine XML registry after Machine::AttachDevice() has been called; Machine::AttachDevice() now takes an IMedium object instead of a UUID; also make Machine::Unregister() work again for inaccessible machines

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageModifyVM.cpp (modified) (2 diffs)
• VBoxManageStorageController.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -661 +661 @@
                     if (hardDisk)
                     {
-                        Bstr uuid;
-                        hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                        CHECK_ERROR(machine, AttachDevice(bstrController, u1, u2, DeviceType_HardDisk, uuid));
+                        CHECK_ERROR(machine, AttachDevice(bstrController, u1, u2, DeviceType_HardDisk, hardDisk));
                     }
                     else
@@ -757 +755 @@
                     if (hardDisk)
                     {
-                        Bstr uuid;
-                        hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                        rc = machine->AttachDevice(Bstr("LsiLogic"), GetOptState.uIndex, 0, DeviceType_HardDisk, uuid);
+                        rc = machine->AttachDevice(Bstr("LsiLogic"), GetOptState.uIndex, 0, DeviceType_HardDisk, hardDisk);
                         if (FAILED(rc))
                             CHECK_ERROR(machine,
                                          AttachDevice(Bstr("BusLogic"),
                                                       GetOptState.uIndex, 0,
-                                                      DeviceType_HardDisk, uuid));
+                                                      DeviceType_HardDisk, hardDisk));
                     }
                     else

trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp

@@ -287 +287 @@
             /* attach a empty floppy/dvd drive after removing previous attachment */
             machine->DetachDevice(Bstr(pszCtl), port, device);
-            CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, deviceType, Bstr("")));
+            CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, deviceType, NULL));
         }
     }
@@ -411 +411 @@
                     {
                         machine->DetachDevice(Bstr(pszCtl), port, device);
-                        rc = machine->AttachDevice(Bstr(pszCtl), port, device, DeviceType_DVD, Bstr(""));
+                        rc = machine->AttachDevice(Bstr(pszCtl), port, device, DeviceType_DVD, NULL);
                     }
                 }
                 else
                 {
-                    rc = machine->AttachDevice(Bstr(pszCtl), port, device, DeviceType_DVD, Bstr(""));
+                    rc = machine->AttachDevice(Bstr(pszCtl), port, device, DeviceType_DVD, NULL);
                 }
             }
@@ -501 +501 @@
             if (hardDisk)
             {
-                Bstr uuid;
-                hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_HardDisk, uuid));
+                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_HardDisk, hardDisk));
             }
             else
@@ -520 +518 @@
             if (   !fRunTime
                 && !floppyAttachment)
-                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_Floppy, Bstr("")));
+                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_Floppy, NULL));
 
             /* host drive? */