Changeset 78509 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 14, 2019 3:16:21 PM (6 years ago)

Author:

vboxsync

Message:

Main/Machine+StorageController+SystemProperties+Console: Add basic support for virtio-scsi storage controller.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• StorageControllerImpl.cpp (modified) (4 diffs)
• SystemPropertiesImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -6000 +6000 @@
 {
     if (   (aConnectionType <= StorageBus_Null)
-        || (aConnectionType >  StorageBus_PCIe))
+        || (aConnectionType >  StorageBus_VirtioSCSI))
         return setError(E_INVALIDARG,
                         tr("Invalid connection type: %d"),

trunk/src/VBox/Main/src-server/StorageControllerImpl.cpp

@@ -96 +96 @@
     ComAssertRet(aParent && !aName.isEmpty(), E_INVALIDARG);
     if (   (aStorageBus <= StorageBus_Null)
-        || (aStorageBus >  StorageBus_PCIe))
+        || (aStorageBus >  StorageBus_VirtioSCSI))
         return setError(E_INVALIDARG,
                         tr("Invalid storage connection type"));
@@ -162 +162 @@
             m->bd->ulPortCount = 1;
             m->bd->controllerType = StorageControllerType_NVMe;
+            break;
+        case StorageBus_VirtioSCSI:
+            m->bd->ulPortCount = 1;
+            m->bd->controllerType = StorageControllerType_VirtioSCSI;
             break;
         case StorageBus_Null: break; /* Shut up MSC. */
@@ -415 +419 @@
             break;
         }
+        case StorageBus_VirtioSCSI:
+        {
+            if (aControllerType != StorageControllerType_VirtioSCSI)
+                rc = E_INVALIDARG;
+            break;
+        }
         default:
             AssertMsgFailed(("Invalid controller type %d\n", m->bd->storageBus));
@@ -560 +570 @@
                                 tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
                                 aPortCount, 1, 255);
+            break;
+        }
+        case StorageBus_VirtioSCSI:
+        {
+            /*
+             * virtio-scsi supports 256 targets (with 16384 LUNs each).
+             */
+            if (aPortCount < 1 || aPortCount > 256)
+                return setError(E_INVALIDARG,
+                                tr("Invalid port count: %lu (must be in range [%lu, %lu])"),
+                                aPortCount, 1, 256);
             break;
         }

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -363 +363 @@
         case StorageBus_USB:
         case StorageBus_PCIe:
+        case StorageBus_VirtioSCSI:
         {
             /* SATA and both SCSI controllers only support one device per port. */
@@ -392 +393 @@
         case StorageBus_SAS:
         case StorageBus_PCIe:
+        case StorageBus_VirtioSCSI:
         {
             *aMinPortCount = 1;
@@ -458 +460 @@
         {
             *aMaxPortCount = 8;
+            break;
+        }
+        case StorageBus_VirtioSCSI:
+        {
+            *aMaxPortCount = 256;
             break;
         }
@@ -480 +487 @@
         case StorageBus_SAS:
         case StorageBus_PCIe:
+        case StorageBus_VirtioSCSI:
             cCtrs = aChipset == ChipsetType_ICH9 ? 8 : 1;
             break;
@@ -511 +519 @@
         case StorageBus_SAS:
         case StorageBus_USB:
+        case StorageBus_VirtioSCSI:
         {
             aDeviceTypes.resize(2);
@@ -548 +557 @@
         case StorageControllerType_USB:
         case StorageControllerType_NVMe:
+        case StorageControllerType_VirtioSCSI:
             *aEnabled = false;
             break;
@@ -575 +585 @@
         case StorageControllerType_BusLogic:
         case StorageControllerType_NVMe:
+        case StorageControllerType_VirtioSCSI:
         case StorageControllerType_PIIX3:
         case StorageControllerType_PIIX4: