VirtualBox

Changeset 82247 in vbox


Ignore:
Timestamp:
Nov 27, 2019 3:54:40 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
135064
Message:

FE/Qt: bugref:9611: UIMachineSettingsStorage: Check whether storage bus is supported before adding related types to bus selection combo.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

    r81676 r82247  
    14601460void ControllerItem::updateBusInfo()
    14611461{
     1462    /* Clear the buses initially: */
    14621463    m_buses.clear();
    14631464
    1464     switch (m_enmBus)
    1465     {
    1466         case KStorageBus_IDE:
    1467         case KStorageBus_SATA:
    1468         case KStorageBus_SCSI:
    1469         case KStorageBus_SAS:
    1470         case KStorageBus_USB:
    1471         case KStorageBus_PCIe:
    1472         case KStorageBus_VirtioSCSI:
    1473         {
    1474             m_buses << KStorageBus_IDE << KStorageBus_SATA << KStorageBus_SCSI << KStorageBus_SAS
    1475                     << KStorageBus_USB << KStorageBus_PCIe << KStorageBus_VirtioSCSI;
    1476             m_buses.removeAll(m_enmBus);
    1477         }
    1478         RT_FALL_THRU();
    1479         default:
    1480         {
    1481             m_buses.prepend(m_enmBus);
    1482             break;
    1483         }
    1484     }
     1465    /* Load currently supported storage buses: */
     1466    CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
     1467    const QVector<KStorageBus> supportedBuses = comProperties.GetSupportedStorageBuses();
     1468
     1469    /* If current bus is NOT KStorageBus_Floppy: */
     1470    if (m_enmBus != KStorageBus_Floppy)
     1471    {
     1472        /* We update the list with all supported buses
     1473         * and remove the current one from that list. */
     1474        m_buses << supportedBuses.toList();
     1475        m_buses.removeAll(m_enmBus);
     1476    }
     1477
     1478    /* And prepend current bus finally: */
     1479    m_buses.prepend(m_enmBus);
    14851480}
    14861481
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette