Changeset 101156 in vbox

Timestamp:

Sep 18, 2023 3:28:39 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: Moved the Intel AHCI into the x86 platform case + increased the port count to 2 when using virtio-SCSI. bugref:10510

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -373 +373 @@
     }
 
-    /* Limit the AHCI port count if it's used because windows has trouble with
-       too many ports and other guest (OS X in particular) may take extra long
-       to boot: */
-    if (hdStorageControllerType == KStorageControllerType_IntelAhci)
-        hdCtr.SetPortCount(1 + (dvdStorageControllerType == KStorageControllerType_IntelAhci));
-    else if (dvdStorageControllerType == KStorageControllerType_IntelAhci)
-        dvdCtr.SetPortCount(1);
-
     KPlatformArchitecture const platformArch = comPlatform.GetArchitecture();
     switch (platformArch)
@@ -386 +378 @@
         case KPlatformArchitecture_x86:
         {
+            /* Limit the AHCI port count if it's used because windows has trouble with
+               too many ports and other guest (OS X in particular) may take extra long
+               to boot: */
+            if (hdStorageControllerType == KStorageControllerType_IntelAhci)
+                hdCtr.SetPortCount(1 + (dvdStorageControllerType == KStorageControllerType_IntelAhci));
+            else if (dvdStorageControllerType == KStorageControllerType_IntelAhci)
+                dvdCtr.SetPortCount(1);
+
             CPlatformX86 comPlatformX86 = comPlatform.GetX86();
 
@@ -402 +402 @@
         case KPlatformArchitecture_ARM:
         {
-            /** @todo BUGBUG ARM stuff goes here. */
+            /* When using VirtioSCSI as the HDD storage controller and the DVD Drive is on that same controller,
+             * we have to raise the port count, as VirtioSCSI only configures one port per default. */
+            if (   hdCtr                                   == dvdCtr
+                && hdStorageControllerType == KStorageControllerType_VirtioSCSI)
+                hdCtr.SetPortCount(2);
             break;
         }