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

Timestamp:

Jul 4, 2012 9:19:44 AM (13 years ago)

Author:

vboxsync

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

78900

Message:

Main/Machine: All attached devices will be detached automatically when a storage controller is removed from VM. Now this logic concentrated in the one place - function STDMETHODIMP Machine::RemoveStorageController.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (modified) (1 diff)

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

@@ -1013 +1013 @@
     if (fRemoveCtl)
     {
-        com::SafeIfaceArray<IMediumAttachment> mediumAttachments;
-
-        CHECK_ERROR(machine,
-                     GetMediumAttachmentsOfController(Bstr(pszCtl).raw(),
-                                                      ComSafeArrayAsOutParam(mediumAttachments)));
-        for (size_t i = 0; i < mediumAttachments.size(); ++ i)
-        {
-            ComPtr<IMediumAttachment> mediumAttach = mediumAttachments[i];
-            LONG port = 0;
-            LONG device = 0;
-
-            CHECK_ERROR(mediumAttach, COMGETTER(Port)(&port));
-            CHECK_ERROR(mediumAttach, COMGETTER(Device)(&device));
-            CHECK_ERROR(machine, DetachDevice(Bstr(pszCtl).raw(), port, device));
-        }
-
-        if (SUCCEEDED(rc))
-            CHECK_ERROR(machine, RemoveStorageController(Bstr(pszCtl).raw()));
-        else
-            errorArgument("Can't detach the devices connected to '%s' Controller\n"
-                          "and thus its removal failed.", pszCtl);
+        CHECK_ERROR(machine, RemoveStorageController(Bstr(pszCtl).raw()));
     }
     else