Changeset 23825 in vbox

Timestamp:

Oct 16, 2009 2:42:34 PM (15 years ago)

Author:

vboxsync

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

53581

Message:

VBoxSDL: removed hardcoded controller names and now controllers are added only when needed

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -871 +871 @@
     char *fdaFile   = NULL;
 #ifdef VBOX_WITH_VRDP
-    char *portVRDP = NULL;
+    const char *portVRDP = NULL;
 #endif
     bool fDiscardState = false;
@@ -1519 +1519 @@
          * Strategy: iterate through all registered hard disk
          * and see if one of them points to the same file. If
-         * so, assign it. If not, register a new image and assing
+         * so, assign it. If not, register a new image and assign
          * it to the VM.
          */
@@ -1538 +1538 @@
              */
             Bstr uuid;
+            Bstr storageCtlName;
             hardDisk->COMGETTER(Id)(uuid.asOutParam());
-            gMachine->DetachDevice(Bstr("IDE Controller"), 0, 0);
-            gMachine->AttachDevice(Bstr("IDE Controller"), 0, 0, DeviceType_HardDisk, uuid);
+
+            /* get the first IDE controller to attach the harddisk to
+             * and if there is none, add one temporarily
+             */
+            {
+                ComPtr<IStorageController> storageCtl;
+                com::SafeIfaceArray<IStorageController> aStorageControllers;
+                CHECK_ERROR (gMachine, COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(aStorageControllers)));
+                for (size_t i = 0; i < aStorageControllers.size(); ++ i)
+                {
+                    StorageBus_T storageBus = StorageBus_Null;
+
+                    CHECK_ERROR (aStorageControllers[i], COMGETTER(Bus)(&storageBus));
+                    if (storageBus == StorageBus_IDE)
+                    {
+                        storageCtl = aStorageControllers[i];
+                        break;
+                    }
+                }
+
+                if (storageCtl)
+                {
+                    CHECK_ERROR (storageCtl, COMGETTER(Name)(storageCtlName.asOutParam()));
+                    gMachine->DetachDevice(storageCtlName, 0, 0);
+                }
+                else
+                {
+                    storageCtlName = "IDE Controller";
+                    CHECK_ERROR (gMachine, AddStorageController(storageCtlName,
+                                                                StorageBus_IDE,
+                                                                storageCtl.asOutParam()));
+                }
+            }
+
+            gMachine->AttachDevice(storageCtlName, 0, 0, DeviceType_HardDisk, uuid);
             /// @todo why is this attachment saved?
         }
@@ -1584 +1618 @@
             }
         }
+
         Bstr id;
+        Bstr storageCtlName;
         floppyMedium->COMGETTER(Id)(id.asOutParam());
-        CHECK_ERROR(gMachine, MountMedium(Bstr("Floppy Controller"), 0, 0, id));
+
+        /* get the first floppy controller to attach the floppy to
+         * and if there is none, add one temporarily
+         */
+        {
+            ComPtr<IStorageController> storageCtl;
+            com::SafeIfaceArray<IStorageController> aStorageControllers;
+            CHECK_ERROR (gMachine, COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(aStorageControllers)));
+            for (size_t i = 0; i < aStorageControllers.size(); ++ i)
+            {
+                StorageBus_T storageBus = StorageBus_Null;
+
+                CHECK_ERROR (aStorageControllers[i], COMGETTER(Bus)(&storageBus));
+                if (storageBus == StorageBus_Floppy)
+                {
+                    storageCtl = aStorageControllers[i];
+                    break;
+                }
+            }
+
+            if (storageCtl)
+            {
+                ComPtr<IMediumAttachment> floppyAttachment;
+
+                CHECK_ERROR (storageCtl, COMGETTER(Name)(storageCtlName.asOutParam()));
+                rc = gMachine->GetMediumAttachment(storageCtlName, 0, 0, floppyAttachment.asOutParam());
+                if (FAILED(rc))
+                    CHECK_ERROR (gMachine, AttachDevice(storageCtlName, 0, 0,
+                                                        DeviceType_Floppy, NULL));
+            }
+            else
+            {
+                storageCtlName = "Floppy Controller";
+                CHECK_ERROR (gMachine, AddStorageController(storageCtlName,
+                                                            StorageBus_Floppy,
+                                                            storageCtl.asOutParam()));
+                CHECK_ERROR (gMachine, AttachDevice(storageCtlName, 0, 0,
+                                                    DeviceType_Floppy, NULL));
+            }
+        }
+
+        CHECK_ERROR (gMachine, MountMedium(storageCtlName, 0, 0, id));
     }
     while (0);
@@ -1626 +1703 @@
             }
         }
+
         Bstr id;
+        Bstr storageCtlName;
         dvdMedium->COMGETTER(Id)(id.asOutParam());
-        CHECK_ERROR(gMachine, MountMedium(Bstr("IDE Controller"), 1, 0, id));
+
+        /* get the first IDE controller to attach the DVD Drive to
+         * and if there is none, add one temporarily
+         */
+        {
+            ComPtr<IStorageController> storageCtl;
+            com::SafeIfaceArray<IStorageController> aStorageControllers;
+            CHECK_ERROR (gMachine, COMGETTER(StorageControllers)(ComSafeArrayAsOutParam(aStorageControllers)));
+            for (size_t i = 0; i < aStorageControllers.size(); ++ i)
+            {
+                StorageBus_T storageBus = StorageBus_Null;
+
+                CHECK_ERROR (aStorageControllers[i], COMGETTER(Bus)(&storageBus));
+                if (storageBus == StorageBus_IDE)
+                {
+                    storageCtl = aStorageControllers[i];
+                    break;
+                }
+            }
+
+            if (storageCtl)
+            {
+                ComPtr<IMediumAttachment> dvdAttachment;
+
+                CHECK_ERROR (storageCtl, COMGETTER(Name)(storageCtlName.asOutParam()));
+                gMachine->DetachDevice(storageCtlName, 1, 0);
+                CHECK_ERROR (gMachine, AttachDevice(storageCtlName, 1, 0,
+                                                    DeviceType_DVD, NULL));
+            }
+            else
+            {
+                storageCtlName = "IDE Controller";
+                CHECK_ERROR (gMachine, AddStorageController(storageCtlName,
+                                                            StorageBus_IDE,
+                                                            storageCtl.asOutParam()));
+                CHECK_ERROR (gMachine, AttachDevice(storageCtlName, 1, 0,
+                                                    DeviceType_DVD, NULL));
+            }
+        }
+
+        CHECK_ERROR(gMachine, MountMedium(storageCtlName, 1, 0, id));
     }
     while (0);