Changeset 17939 in vbox

Timestamp:

Mar 16, 2009 2:28:53 PM (16 years ago)

Author:

vboxsync

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

44513

Message:

VBoxManage: Make it possible to specify the SCSI controller type

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -40 +40 @@
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
         $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
-        $(if $(VBOX_WITH_AHCI), VBOX_WITH_LSILOGIC) \
+        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS) \
         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -158 +158 @@
                  "                            [-sataideemulation<1-4> <1-30>]\n"
 #endif
-#ifdef VBOX_WITH_LSILOGIC
-                 "                            [-lsilogic on|off]\n"
-                 "                            [-lsilogicport<1-16> none|<uuid>|<filename>]\n"
+#ifdef VBOX_WITH_SCSI
+                 "                            [-scsi on|off]\n"
+                 "                            [-scsiport<1-16> none|<uuid>|<filename>]\n"
+                 "                            [-scsitype LsiLogic|BusLogic]\n"
 #endif
                  "                            [-dvd none|<uuid>|<filename>|host:<drive>]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -100 +100 @@
     ULONG guestStatInterval = (ULONG)-1;
     int   fSataEnabled = -1;
-    int   fLsiLogicEnabled = -1;
+    int   fScsiEnabled = -1;
+    int   fScsiLsiLogic = -1;
     int   sataPortCount = -1;
     int   sataBootDevices[4] = {-1,-1,-1,-1};
@@ -734 +735 @@
             sataBootDevices[bootDevicePos] = n-1;
         }
-        else if (strcmp(a->argv[i], "-lsilogic") == 0)
+        else if (strcmp(a->argv[i], "-scsi") == 0)
         {
             if (a->argc <= i + 1)
@@ -740 +741 @@
             i++;
             if (strcmp(a->argv[i], "on") == 0 || strcmp(a->argv[i], "enable") == 0)
-                fLsiLogicEnabled = 1;
+                fScsiEnabled = 1;
             else if (strcmp(a->argv[i], "off") == 0 || strcmp(a->argv[i], "disable") == 0)
-                fLsiLogicEnabled = 0;
-            else
-                return errorArgument("Invalid -lsilogic argument '%s'", a->argv[i]);
-        }
-        else if (strncmp(a->argv[i], "-lsilogicport", 13) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][13], 16, "LsiLogic");
+                fScsiEnabled = 0;
+            else
+                return errorArgument("Invalid -scsi argument '%s'", a->argv[i]);
+        }
+        else if (strncmp(a->argv[i], "-scsiport", 9) == 0)
+        {
+            unsigned n = parseNum(&a->argv[i][9], 16, "SCSI");
             if (!n)
                 return 1;
@@ -755 +756 @@
             i++;
             hdds[n-1+34] = a->argv[i];
+        }
+        else if (strcmp(a->argv[i], "-scsitype") == 0)
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (strcmp(a->argv[i], "LsiLogic") == 0 )
+                fScsiLsiLogic = 1;
+            else if (strcmp(a->argv[i], "BusLogic") == 0)
+                fScsiLsiLogic = 0;
+            else
+                return errorArgument("Invalid -scsitype argument '%s'", a->argv[i]);
         }
         else
@@ -1858 +1871 @@
 
         /*
-         * LsiLogic controller enable/disable
+         * SCSI controller enable/disable
          */
-        if (fLsiLogicEnabled != -1)
-        {
-            if (fLsiLogicEnabled)
+        if (fScsiEnabled != -1)
+        {
+            if (fScsiEnabled)
             {
                 ComPtr<IStorageController> ctl;
-                CHECK_ERROR(machine, AddStorageController(Bstr("LsiLogic"), StorageBus_SCSI, ctl.asOutParam()));
-                CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic));
-            }
-            else
-                CHECK_ERROR(machine, RemoveStorageController(Bstr("LsiLogic")));
+                if (fScsiLsiLogic == 0)
+                {
+                    CHECK_ERROR(machine, AddStorageController(Bstr("BusLogic"), StorageBus_SCSI, ctl.asOutParam()));
+                    CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_BusLogic));
+                }
+                else /* LsiLogic is default */
+                {
+                    CHECK_ERROR(machine, AddStorageController(Bstr("LsiLogic"), StorageBus_SCSI, ctl.asOutParam()));
+                    CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_LsiLogic));
+                }
+            }
+            else
+            {
+                rc = machine->RemoveStorageController(Bstr("LsiLogic"));
+                if (!SUCCEEDED(rc))
+                    CHECK_ERROR(machine, RemoveStorageController(Bstr("BusLogic")));
+            }
         }
 
@@ -1878 +1903 @@
                 if (strcmp(hdds[i], "none") == 0)
                 {
-                    machine->DetachHardDisk(Bstr("LsiLogic"), i-34, 0);
+                    rc = machine->DetachHardDisk(Bstr("LsiLogic"), i-34, 0);
+                    if (!SUCCEEDED(rc))
+                        CHECK_ERROR(machine, DetachHardDisk(Bstr("BusLogic"), i-34, 0));
                 }
                 else
@@ -1899 +1926 @@
                     {
                         hardDisk->COMGETTER(Id)(uuid.asOutParam());
-                        CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("LsiLogic"), i-34, 0));
+                        rc = machine->AttachHardDisk(uuid, Bstr("LsiLogic"), i-34, 0);
+                        if (!SUCCEEDED(rc))
+                            CHECK_ERROR(machine, AttachHardDisk(uuid, Bstr("BusLogic"), i-34, 0));
                     }
                     else