Changeset 78517 in vbox for trunk/src

Timestamp:

May 14, 2019 3:52:41 PM (6 years ago)

Author:

vboxsync

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

130557

Message:

FE/Qt: bugref:9440: VM Settings / Storage page: Cleanup for r130553 required after r130539.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsStorage.cpp (modified) (3 diffs)
• UIMachineSettingsStorage.h (modified) (1 diff)

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

@@ -454 +454 @@
     switch (mBusType)
     {
-        case KStorageBus_IDE:    return KStorageControllerType_PIIX3;
-        case KStorageBus_SATA:   return KStorageControllerType_IntelAhci;
-        case KStorageBus_SCSI:   return KStorageControllerType_LsiLogic;
-        case KStorageBus_Floppy: return KStorageControllerType_I82078;
-        case KStorageBus_SAS:    return KStorageControllerType_LsiLogicSas;
-        case KStorageBus_USB:    return KStorageControllerType_USB;
-        case KStorageBus_PCIe:   return KStorageControllerType_NVMe;
-        default:                 AssertFailedReturn(KStorageControllerType_Null);
+        case KStorageBus_IDE:        return KStorageControllerType_PIIX3;
+        case KStorageBus_SATA:       return KStorageControllerType_IntelAhci;
+        case KStorageBus_SCSI:       return KStorageControllerType_LsiLogic;
+        case KStorageBus_Floppy:     return KStorageControllerType_I82078;
+        case KStorageBus_SAS:        return KStorageControllerType_LsiLogicSas;
+        case KStorageBus_USB:        return KStorageControllerType_USB;
+        case KStorageBus_PCIe:       return KStorageControllerType_NVMe;
+        case KStorageBus_VirtioSCSI: return KStorageControllerType_VirtioSCSI;
+        default:                     AssertFailedReturn(KStorageControllerType_Null);
     }
 }
@@ -469 +470 @@
     switch (mBusType)
     {
-        case KStorageBus_IDE:    return 3;
-        case KStorageBus_SATA:   return 1;
-        case KStorageBus_SCSI:   return 2;
-        case KStorageBus_Floppy: return 1;
-        case KStorageBus_SAS:    return 1;
-        case KStorageBus_USB:    return 1;
-        case KStorageBus_PCIe:   return 1;
-        default:                 AssertFailedReturn(0);
-    }
-}
-
-
-/* virtio-scsi Controller Type */
-VirtioSCSIStorageControllerType::VirtioSCSIStorageControllerType (KStorageControllerType aSubType)
-    : AbstractControllerType (KStorageBus_VirtioSCSI, aSubType)
-{
-}
-
-KStorageControllerType VirtioSCSIStorageControllerType::first() const
-{
-    return KStorageControllerType_VirtioSCSI;
-}
-
-uint VirtioSCSIStorageControllerType::size() const
-{
-    return 1;
+        case KStorageBus_IDE:        return 3;
+        case KStorageBus_SATA:       return 1;
+        case KStorageBus_SCSI:       return 2;
+        case KStorageBus_Floppy:     return 1;
+        case KStorageBus_SAS:        return 1;
+        case KStorageBus_USB:        return 1;
+        case KStorageBus_PCIe:       return 1;
+        case KStorageBus_VirtioSCSI: return 1;
+        default:                     AssertFailedReturn(0);
+    }
 }
 
@@ -660 +645 @@
             break;
         case KStorageBus_VirtioSCSI:
-            mCtrType = new VirtioSCSIStorageControllerType (aControllerType);
+            mCtrType = new AbstractControllerType(KStorageBus_VirtioSCSI, aControllerType);
             break;
 

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

@@ -166 +166 @@
     KStorageControllerType mCtrType;
     QList<PixmapType> mPixmaps;
-};
-
-/* virtio-scsi Controller Type */
-class SHARED_LIBRARY_STUFF VirtioSCSIStorageControllerType : public AbstractControllerType
-{
-public:
-
-    VirtioSCSIStorageControllerType (KStorageControllerType aSubType);
-
-private:
-
-    KStorageControllerType first() const;
-    uint size() const;
 };