Changeset 24511 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (1 diff)
• VBoxMediaManagerDlg.cpp (modified) (3 diffs)
• VBoxSelectorWnd.cpp (modified) (1 diff)

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());
                 }
             }