Changeset 82267 in vbox

Timestamp:

Nov 28, 2019 2:54:36 PM (5 years ago)

Author:

vboxsync

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

135085

Message:

FE/Qt: bugref:9611: UIMachineSettingsStorage: Rework controller items to cache possible controller types instead of calculating them every time; Check whether storage controller type is supported as well before adding related types to bus selection combo (s.a. r135064).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -497 +497 @@
     /** Updates possible buses. */
     void updateBusInfo();
+    /** Updates possible types. */
+    void updateTypeInfo();
     /** Updates pixmaps of possible buses. */
     void updatePixmaps();
@@ -511 +513 @@
 
     /** Holds the possible buses. */
-    ControllerBusList   m_buses;
+    ControllerBusList                      m_buses;
+    /** Holds the possible types on per bus basis. */
+    QMap<KStorageBus, ControllerTypeList>  m_types;
     /** Holds the pixmaps of possible buses. */
-    QList<PixmapType>   m_pixmaps;
+    QList<PixmapType>                      m_pixmaps;
 
     /** Holds the current port count. */
@@ -1251 +1255 @@
 
     updateBusInfo();
+    updateTypeInfo();
     updatePixmaps();
 
@@ -1282 +1287 @@
 
     updateBusInfo();
+    updateTypeInfo();
     updatePixmaps();
 }
@@ -1298 +1304 @@
 {
     m_enmType = enmType;
+
+    updateTypeInfo();
 }
 
@@ -1307 +1315 @@
 ControllerTypeList ControllerItem::types(KStorageBus enmBus) const
 {
-    ControllerTypeList types;
-
-    KStorageControllerType enmFirstType = KStorageControllerType_Null;
-    uint cAmount = 0;
-    switch (enmBus)
-    {
-        case KStorageBus_IDE:        enmFirstType = KStorageControllerType_PIIX3; cAmount = 3; break;
-        case KStorageBus_SATA:       enmFirstType = KStorageControllerType_IntelAhci; cAmount = 1; break;
-        case KStorageBus_SCSI:       enmFirstType = KStorageControllerType_LsiLogic; cAmount = 2; break;
-        case KStorageBus_Floppy:     enmFirstType = KStorageControllerType_I82078; cAmount = 1; break;
-        case KStorageBus_SAS:        enmFirstType = KStorageControllerType_LsiLogicSas; cAmount = 1; break;
-        case KStorageBus_USB:        enmFirstType = KStorageControllerType_USB; cAmount = 1; break;
-        case KStorageBus_PCIe:       enmFirstType = KStorageControllerType_NVMe; cAmount = 1; break;
-        case KStorageBus_VirtioSCSI: enmFirstType = KStorageControllerType_VirtioSCSI; cAmount = 1; break;
-        default:                     break;
-    }
-    AssertMsgReturn(enmFirstType != KStorageControllerType_Null, ("Invalid bus: %d!\n", (int)enmBus), types);
-
-    for (uint i = enmFirstType; i < enmFirstType + cAmount; ++i)
-        types << static_cast<KStorageControllerType>(i);
-
-    return types;
+    return m_types.value(enmBus);
 }
 
@@ -1478 +1465 @@
     /* And prepend current bus finally: */
     m_buses.prepend(m_enmBus);
+}
+
+void ControllerItem::updateTypeInfo()
+{
+    /* Clear the types initially: */
+    m_types.clear();
+
+    /* Load currently supported storage buses & types: */
+    CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+    const QVector<KStorageBus> supportedBuses = comProperties.GetSupportedStorageBuses();
+    const QVector<KStorageControllerType> supportedTypes = comProperties.GetSupportedStorageControllerTypes();
+
+    /* We update the list with all supported buses
+     * and remove the current one from that list. */
+    ControllerBusList possibleBuses = supportedBuses.toList();
+    possibleBuses.removeAll(m_enmBus);
+
+    /* And prepend current bus finally: */
+    possibleBuses.prepend(m_enmBus);
+
+    /* Enumerate possible buses: */
+    foreach (const KStorageBus &enmBus, possibleBuses)
+    {
+        /* This is hardcoded hell, we will get rid of it one day .. */
+        KStorageControllerType enmFirstType = KStorageControllerType_Null;
+        uint cAmount = 0;
+        switch (enmBus)
+        {
+            case KStorageBus_IDE:        enmFirstType = KStorageControllerType_PIIX3; cAmount = 3; break;
+            case KStorageBus_SATA:       enmFirstType = KStorageControllerType_IntelAhci; cAmount = 1; break;
+            case KStorageBus_SCSI:       enmFirstType = KStorageControllerType_LsiLogic; cAmount = 2; break;
+            case KStorageBus_Floppy:     enmFirstType = KStorageControllerType_I82078; cAmount = 1; break;
+            case KStorageBus_SAS:        enmFirstType = KStorageControllerType_LsiLogicSas; cAmount = 1; break;
+            case KStorageBus_USB:        enmFirstType = KStorageControllerType_USB; cAmount = 1; break;
+            case KStorageBus_PCIe:       enmFirstType = KStorageControllerType_NVMe; cAmount = 1; break;
+            case KStorageBus_VirtioSCSI: enmFirstType = KStorageControllerType_VirtioSCSI; cAmount = 1; break;
+            default:                     break;
+        }
+
+        /* Check whether type is supported or already selected before adding it: */
+        for (uint i = enmFirstType; i < enmFirstType + cAmount; ++i)
+        {
+            const KStorageControllerType enmType = static_cast<KStorageControllerType>(i);
+            if (supportedTypes.contains(enmType) || enmType == m_enmType)
+                m_types[enmBus] << enmType;
+        }
+    }
 }