Changeset 42015 in vbox for trunk

Timestamp:

Jul 4, 2012 8:09:55 AM (13 years ago)

Author:

vboxsync

Message:

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/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -5827 +5827 @@
     if (FAILED(rc)) return rc;
 
-    /* We can remove the controller only if there is no device attached. */
-    /* check if the device slot is already busy */
-    for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-         it != mMediaData->mAttachments.end();
-         ++it)
-    {
-        if ((*it)->getControllerName() == aName)
-            return setError(VBOX_E_OBJECT_IN_USE,
-                            tr("Storage controller named '%ls' has still devices attached"),
-                            aName);
+    {/* find all attached devices to the appropriate storage controller and detach them all*/
+        MediaData::AttachmentList::const_iterator beginList = mMediaData->mAttachments.begin();
+        MediaData::AttachmentList::const_iterator endList = mMediaData->mAttachments.end();
+        LONG port = 0;
+        LONG device = 0;
+
+        for (MediaData::AttachmentList::const_iterator it = beginList;
+             it != endList;
+             it++)
+        {
+            if ((*it)->getControllerName() == aName)
+            {
+                port = (*it)->getPort();
+
+                device = (*it)->getDevice();
+
+                rc = DetachDevice(aName, port, device);
+                if (FAILED(rc)) return rc;
+            }
+        }
     }