Changeset 96131 in vbox

Timestamp:

Aug 10, 2022 3:49:43 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt+Main/testcase/tstOVF.cpp: A few small updates to the VBox GUI to
recognize Virtio-SCSI controllers in order to round out the support for
exporting an appliance which contains a Virtio-SCSI controller.
bugref:9745

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (modified) (1 diff)
• Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)
• Main/testcase/tstOVF.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -484 +484 @@
                     case KVirtualSystemDescriptionType_HardDiskControllerSATA: value = UIApplianceEditorWidget::tr("Storage Controller (SATA)"); break;
                     case KVirtualSystemDescriptionType_HardDiskControllerSCSI: value = UIApplianceEditorWidget::tr("Storage Controller (SCSI)"); break;
+                    case KVirtualSystemDescriptionType_HardDiskControllerVirtioSCSI:  value = UIApplianceEditorWidget::tr("Storage Controller (VirtioSCSI)"); break;
                     case KVirtualSystemDescriptionType_HardDiskControllerSAS:  value = UIApplianceEditorWidget::tr("Storage Controller (SAS)"); break;
                     case KVirtualSystemDescriptionType_CDROM:                  value = UIApplianceEditorWidget::tr("DVD"); break;
@@ -658 +659 @@
                     case KVirtualSystemDescriptionType_HardDiskControllerSATA: value = UIIconPool::iconSet(":/sata_16px.png"); break;
                     case KVirtualSystemDescriptionType_HardDiskControllerSCSI: value = UIIconPool::iconSet(":/scsi_16px.png"); break;
+                    case KVirtualSystemDescriptionType_HardDiskControllerVirtioSCSI:  value = UIIconPool::iconSet(":/virtio_scsi_16px.png"); break;
                     case KVirtualSystemDescriptionType_HardDiskControllerSAS:  value = UIIconPool::iconSet(":/sas_16px.png"); break;
                     case KVirtualSystemDescriptionType_HardDiskImage:          value = UIIconPool::iconSet(":/hd_16px.png"); break;
@@ -1343 +1345 @@
                     types[i] == KVirtualSystemDescriptionType_HardDiskControllerSATA ||
                     types[i] == KVirtualSystemDescriptionType_HardDiskControllerSCSI ||
+                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerVirtioSCSI ||
                     types[i] == KVirtualSystemDescriptionType_HardDiskControllerSAS)
                     controllerMap[i] = pHardwareItem;
@@ -1683 +1686 @@
     KVirtualSystemDescriptionType_HardDiskControllerSATA,
     KVirtualSystemDescriptionType_HardDiskControllerSCSI,
+    KVirtualSystemDescriptionType_HardDiskControllerVirtioSCSI,
     KVirtualSystemDescriptionType_HardDiskControllerSAS,
     /* OCI */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp

@@ -46 +46 @@
             << KVirtualSystemDescriptionType_HardDiskControllerSATA
             << KVirtualSystemDescriptionType_HardDiskControllerSCSI
+            << KVirtualSystemDescriptionType_HardDiskControllerVirtioSCSI
             << KVirtualSystemDescriptionType_HardDiskControllerSAS
             << KVirtualSystemDescriptionType_CloudProfileName;

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

@@ -5310 +5310 @@
     <const name="HardDiskControllerSCSI" value="16" />
     <const name="HardDiskControllerSAS" value="17" />
+    <const name="HardDiskControllerVirtioSCSI" value="60" />
 */
 

trunk/src/VBox/Main/testcase/tstOVF.cpp

@@ -195 +195 @@
                 break;
 
+                case VirtualSystemDescriptionType_HardDiskControllerVirtioSCSI:
+                    pcszType = "virtio-scsi";
+                break;
+
                 case VirtualSystemDescriptionType_HardDiskImage:
                     pcszType = "hd";