Changeset 24511 in vbox for trunk/src/VBox

Timestamp:

Nov 9, 2009 3:27:28 PM (15 years ago)

Author:

vboxsync

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

54606

Message:

Main/MediumAttchment: back out API change which changed the return type of the Controller attribute from string to IStorageController *

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)
• Main/ApplianceImpl.cpp (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (3 diffs)
• Main/MachineImpl.cpp (modified) (4 diffs)
• Main/MediumAttachmentImpl.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MediumAttachmentImpl.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2171 +2171 @@
     Assert (mediumType != VBoxDefs::MediumType_Invalid);
 
-    const CMediumAttachmentVector &attachments = mSession.GetMachine().GetMediumAttachments();
+    CMachine machine = mSession.GetMachine();
+    const CMediumAttachmentVector &attachments = machine.GetMediumAttachments();
     foreach (const CMediumAttachment &attachment, attachments)
     {
-        CStorageController controller = attachment.GetController();
+        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
         if (   !controller.isNull()
             && (attachment.GetType() == deviceType))

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -1179 +1179 @@
                 if (attachment.GetMedium().GetId() == aMedium.id())
                 {
-                    CStorageController controller = attachment.GetController();
-                    machine.DetachDevice (controller.GetName(), attachment.GetPort(), attachment.GetDevice());
+                    machine.DetachDevice (attachment.GetController(), attachment.GetPort(), attachment.GetDevice());
                     if (!machine.isOk())
                     {
+                        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
                         vboxProblem().cannotDetachDevice (this, machine, VBoxDefs::MediumType_HardDisk, aMedium.location(),
                                                           controller.GetBus(), attachment.GetPort(), attachment.GetDevice());
@@ -1202 +1202 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""), false /* force */);
+                    machine.MountMedium (attachment.GetController(), attachment.GetPort(), attachment.GetDevice(), QString(""), false /* force */);
                     if (!machine.isOk())
                     {
+                        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
                         vboxProblem().cannotUnmountMedium (this, machine, aMedium);
                         success = false;
@@ -1223 +1224 @@
                 if (medium.id() == aMedium.id())
                 {
-                    machine.MountMedium (attachment.GetController().GetName(), attachment.GetPort(), attachment.GetDevice(), QString(""), false /* force */);
+                    machine.MountMedium (attachment.GetController(), attachment.GetPort(), attachment.GetDevice(), QString(""), false /* force */);
                     if (!machine.isOk())
                     {
+                        CStorageController controller = machine.GetStorageControllerByName (attachment.GetController());
                         vboxProblem().cannotUnmountMedium (this, machine, aMedium);
                         success = false;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -911 +911 @@
             {
                 CMediumAttachment hda = vec [i];
-                CStorageController controller = hda.GetController();
-                machine.DetachDevice(controller.GetName(), hda.GetPort(), hda.GetDevice());
+                const QString ctlName = hda.GetController();
+
+                machine.DetachDevice(ctlName, hda.GetPort(), hda.GetDevice());
                 if (!machine.isOk())
                 {
+                    CStorageController ctl = machine.GetStorageControllerByName(ctlName);
                     vboxProblem().cannotDetachDevice (this, machine, VBoxDefs::MediumType_HardDisk,
                         vboxGlobal().getMedium (CMedium (hda.GetMedium())).location(),
-                        controller.GetBus(), hda.GetPort(), hda.GetDevice());
+                        ctl.GetBus(), hda.GetPort(), hda.GetDevice());
                 }
             }

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -4446 +4446 @@
             ComPtr<IMedium> pMedium;
             ComPtr<IStorageController> ctl;
-
-            rc = pHDA->COMGETTER(Controller)(ctl.asOutParam());
+            Bstr controllerName;
+
+            rc = pHDA->COMGETTER(Controller)(controllerName.asOutParam());
+            if (FAILED(rc)) throw rc;
+
+            rc = GetStorageControllerByName(controllerName, ctl.asOutParam());
             if (FAILED(rc)) throw rc;
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2769 +2769 @@
     rc = mMachine->COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(ctrls));
     AssertComRC(rc);
+    Bstr attCtrlName;
+    rc = aMediumAttachment->COMGETTER(Controller)(attCtrlName.asOutParam());
+    AssertComRC(rc);
     ComPtr<IStorageController> ctrl;
-    rc = aMediumAttachment->COMGETTER(Controller)(ctrl.asOutParam());
-    AssertComRC(rc);
+    for (size_t i = 0; i < ctrls.size(); ++i)
+    {
+        Bstr ctrlName;
+        rc = ctrls[i]->COMGETTER(Name)(ctrlName.asOutParam());
+        AssertComRC(rc);
+        if (attCtrlName == ctrlName)
+        {
+            ctrl = ctrls[i];
+            break;
+        }
+    }
+    if (ctrl.isNull())
+    {
+        return setError(E_FAIL,
+                        tr("Could not find storage controller '%ls'"), attCtrlName.raw());
+    }
     StorageControllerType_T enmCtrlType;
     rc = ctrl->COMGETTER(ControllerType)(&enmCtrlType);
@@ -7321 +7338 @@
             {
                 ComPtr<IStorageController> controller;
+                BSTR controllerName;
                 ULONG lInstance;
                 StorageControllerType_T enmController;
@@ -7329 +7347 @@
                 * so we have to query needed values here and pass them.
                 */
-                rc = atts[i]->COMGETTER(Controller)(controller.asOutParam());
+                rc = atts[i]->COMGETTER(Controller)(&controllerName);
+                if (FAILED(rc))
+                    break;
+
+                rc = that->mMachine->GetStorageControllerByName(controllerName, controller.asOutParam());
                 if (FAILED(rc)) throw rc;
+
                 rc = controller->COMGETTER(ControllerType)(&enmController);
-                if (FAILED (rc)) throw rc;
                 rc = controller->COMGETTER(Instance)(&lInstance);
-                if (FAILED (rc)) throw rc;
 
                 /*

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2584 +2584 @@
                          * descendant of medium will be used
                          */
-                        if (pAttach->matches(aControllerName, aControllerPort, aDevice))
+                        if (    (*it)->device() == aDevice
+                             && (*it)->port() == aControllerPort
+                             && (*it)->controllerName() == aControllerName
+                           )
                         {
                             foundIt = it;
@@ -3872 +3875 @@
          ++it)
     {
-        if (Bstr((*it)->controllerName()) == aName)
+        if ((*it)->controllerName() == aName)
             return setError(VBOX_E_OBJECT_IN_USE,
                             tr("Storage controller named '%ls' has still devices attached"),
@@ -6040 +6043 @@
             break;
 
+        const Bstr controllerName = aStorageController->name();
         ComObjPtr<MediumAttachment> pAttachment;
         pAttachment.createObject();
         rc = pAttachment->init(this,
                                medium,
-                               aStorageController->name(),
+                               controllerName,
                                dev.lPort,
                                dev.lDevice,
@@ -6188 +6192 @@
          ++it)
     {
-        if (Bstr((*it)->controllerName()) == aName)
+        if ((*it)->controllerName() == aName)
             atts.push_back(*it);
     }

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -180 +180 @@
 }
 
-STDMETHODIMP MediumAttachment::COMGETTER(Controller)(IStorageController **aController)
+STDMETHODIMP MediumAttachment::COMGETTER(Controller)(BSTR *aController)
 {
     LogFlowThisFuncEnter();
@@ -190 +190 @@
 
     /* m->controller is constant during life time, no need to lock */
-    /** @todo ugly hack, MediumAttachment should have a direct reference
-     * to the storage controller, but can't have that right now due to
-     * how objects are created for settings rollback support. */
-    HRESULT rc = E_FAIL;
-
-    if (mParent)
-        rc = mParent->GetStorageControllerByName(m->controllerName, aController);
-
-    LogFlowThisFuncLeave();
-    return rc;
+    m->controllerName.cloneTo(aController);
+
+    LogFlowThisFuncLeave();
+    return S_OK;
 }
 

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

@@ -8780 +8780 @@
   <interface
     name="IMediumAttachment" extends="$unknown"
-    uuid="7bb6ac41-8c03-4863-9eea-d9c76561b8d1"
+    uuid="e58eb3eb-8627-428b-bdf8-34487c848de5"
     wsmap="struct"
   >
@@ -8800 +8800 @@
     </attribute>
 
-    <attribute name="controller" type="IStorageController" readonly="yes">
-      <desc>Storage controller object to which this attachment belongs.</desc>
+    <attribute name="controller" type="wstring" readonly="yes">
+      <desc>Name of the storage controller of this attachment; this
+        refers to one of the controllers in <link to="IMachine::storageControllers" />
+        by name.</desc>
     </attribute>
 

trunk/src/VBox/Main/include/MediumAttachmentImpl.h

@@ -26 +26 @@
 
 #include "MediumImpl.h"
-#include "StorageControllerImpl.h"
 
 class Machine;
@@ -69 +68 @@
     // IMediumAttachment properties
     STDMETHOD(COMGETTER(Medium))(IMedium **aMedium);
-    STDMETHOD(COMGETTER(Controller))(IStorageController **aController);
+    STDMETHOD(COMGETTER(Controller))(BSTR *aController);
     STDMETHOD(COMGETTER(Port))(LONG *aPort);
     STDMETHOD(COMGETTER(Device))(LONG *aDevice);
@@ -136 +135 @@
          * to the old, uninitialized instance. Changing this requires
          * substantial changes to MediumImpl.cpp. */
-        Bstr controllerName;
+        const Bstr controllerName;
         const LONG port;
         const LONG device;