Changeset 42788 in vbox for trunk

Timestamp:

Aug 13, 2012 9:49:33 AM (12 years ago)

Author:

vboxsync

Message:

Main/Machine:

1. function STDMETHODIMP Machine::RemoveStorageController - replaced Iterator in the cycle by simple counter for go through all meadia attachments.
2. function STDMETHODIMP Machine::RemoveStorageController - replaced DetachDevice by detachDevice.

File:

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

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

@@ -5945 +5945 @@
     {
         /* find all attached devices to the appropriate storage controller and detach them all*/
-        MediaData::AttachmentList::const_iterator endList = mMediaData->mAttachments.end();
         MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
-        for (;it != endList; it++)
-        {
-            MediumAttachment *pAttachTemp = *it;
+
+        uint16_t howManyAttach = mMediaData->mAttachments.size();
+
+        for (uint16_t i=0;i<howManyAttach; ++i)
+        {
+            MediumAttachment *pAttachTemp = *it++;
+
             AutoCaller localAutoCaller(pAttachTemp);
             if (FAILED(localAutoCaller.rc())) return localAutoCaller.rc();
@@ -5959 +5962 @@
                 LONG port = pAttachTemp->getPort();
                 LONG device = pAttachTemp->getDevice();
-                rc = DetachDevice(aName, port, device);
+
+                //rc = DetachDevice(aName, port, device);
+                rc = detachDevice(pAttachTemp, alock, NULL);
                 if (FAILED(rc)) return rc;
             }