Changeset 42017 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

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.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageStorageController.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (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

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3276 +3276 @@
         if (fSuccess && !controller.isNull())
         {
-            /* Remove storage attachments first: */
-            // TODO: Later, it will be possible to remove controller with all the attachments at one shot!
-            /* For each storage attachment: */
-            for (int iAttachmentIndex = 0; fSuccess && iAttachmentIndex < controllerCache.childCount(); ++iAttachmentIndex)
-            {
-                /* Get attachment cache: */
-                const UICacheSettingsMachineStorageAttachment &attachmentCache = controllerCache.child(iAttachmentIndex);
-
-                /* Remove attachment if it was not just 'created': */
-                if (!attachmentCache.wasCreated())
-                    fSuccess = removeStorageAttachment(controllerCache, attachmentCache);
-            }
-            /* Remove storage controller finally: */
-            if (fSuccess)
-            {
-                m_machine.RemoveStorageController(strControllerName);
-                /* Check that machine is OK: */
-                fSuccess = m_machine.isOk();
-            }
+            /*remove controller with all the attachments at one shot*/
+            m_machine.RemoveStorageController(strControllerName);
+            /* Check that machine is OK: */
+            fSuccess = m_machine.isOk();
         }
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -5202 +5202 @@
     <method name="removeStorageController">
       <desc>
-        Removes a storage controller from the machine.
+        Removes a storage controller from the machine with all devices attache to one.
 
         <result name="VBOX_E_OBJECT_NOT_FOUND">