Changeset 78512 in vbox for trunk/src

Timestamp:

May 14, 2019 3:26:58 PM (6 years ago)

Author:

vboxsync

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

130552

Message:

Frontends/VBoxManage: Allow adding virtio-net storage controller.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (1 diff)
• VBoxManageStorageController.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -929 +929 @@
                            "%s storagectl %s      <uuid|vmname>\n"
                      "                            --name <name>\n"
-                     "                            [--add ide|sata|scsi|floppy|sas|usb|pcie]\n"
+                     "                            [--add ide|sata|scsi|floppy|sas|usb|pcie|virtio]\n"
                      "                            [--controller LSILogic|LSILogicSAS|BusLogic|\n"
                      "                                          IntelAHCI|PIIX3|PIIX4|ICH6|I82078|\n"
-                     "                            [             USB|NVMe]\n"
+                     "                            [             USB|NVMe|VirtIO]\n"
                      "                            [--portcount <1-n>]\n"
                      "                            [--hostiocache on|off]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -700 +700 @@
     systemProperties->GetMaxDevicesPerPortForStorageBus(StorageBus_PCIe, &ulValue);
     RTPrintf("Maximum Devices per NVMe Port:   %u\n", ulValue);
+    systemProperties->GetMaxInstancesOfStorageBus(ChipsetType_PIIX3, StorageBus_VirtioSCSI, &ulValue);
+    RTPrintf("Maximum virtio-scsi PIIX3 Controllers:  %u\n", ulValue);
+    systemProperties->GetMaxInstancesOfStorageBus(ChipsetType_ICH9, StorageBus_VirtioSCSI, &ulValue);
+    RTPrintf("Maximum virtio-scsi ICH9 Controllers:   %u\n", ulValue);
+    systemProperties->GetMaxPortCountForStorageBus(StorageBus_VirtioSCSI, &ulValue);
+    RTPrintf("Maximum virtio-scsi Port count:         %u\n", ulValue);
+    systemProperties->GetMaxDevicesPerPortForStorageBus(StorageBus_VirtioSCSI, &ulValue);
+    RTPrintf("Maximum Devices per virtio-scsi Port:   %u\n", ulValue);
     systemProperties->GetMaxInstancesOfStorageBus(ChipsetType_PIIX3, StorageBus_Floppy, &ulValue);
     RTPrintf("Maximum PIIX3 Floppy Controllers:%u\n", ulValue);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp

@@ -1110 +1110 @@
                                                           ctl.asOutParam()));
             }
+            else if (!RTStrICmp(pszBusType, "virtio-scsi") || !RTStrICmp(pszBusType, "virtio"))
+            {
+                CHECK_ERROR(machine, AddStorageController(Bstr(pszCtl).raw(),
+                                                          StorageBus_VirtioSCSI,
+                                                          ctl.asOutParam()));
+            }
             else
             {
@@ -1166 +1172 @@
                 {
                     CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_NVMe));
+                }
+                else if (!RTStrICmp(pszCtlType, "virtio-scsi") || !RTStrICmp(pszCtlType, "virtio"))
+                {
+                    CHECK_ERROR(ctl, COMSETTER(ControllerType)(StorageControllerType_VirtioSCSI));
                 }
                 else