Changeset 101472 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Oct 17, 2023 11:45:00 AM (16 months ago)

Author:

vboxsync

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

159541

Message:

FE/VBoxManage,FE/Qt,Main/{VirtualBox.xidl,Appliance}: Add the ability to
export and import VMs which contain an NVMe storage controller.
bugref:10159 ticketref:19320

File:

• trunk/src/VBox/Main/xml/ovfreader.cpp (modified) (3 diffs)

trunk/src/VBox/Main/xml/ovfreader.cpp

@@ -653 +653 @@
                         break;
 
-                    case ResourceType_OtherStorageDevice:        // 20       SATA controller
+                    case ResourceType_OtherStorageDevice:        // 20       SATA/Virtio-SCSI/NVMe controller
                     {
                         /* <Item>
@@ -678 +678 @@
                         {
                             HardDiskController hdc;
-                            hdc.system = HardDiskController::VIRTIOSCSI; /**< r=klaus: GUI needs to learn about this in the import dialog, currently shown as "Unknown Hardware Item". */
+                            hdc.system = HardDiskController::VIRTIOSCSI;
                             hdc.strIdController = i.strInstanceID;
                             //<rasd:ResourceSubType>VirtioSCSI</rasd:ResourceSubType>
@@ -684 +684 @@
                             vsys.mapControllers[i.strInstanceID] = hdc;
                         }
+                        else if (   i.strResourceSubType.compare("NVMe", RTCString::CaseInsensitive) == 0
+                                 || i.strResourceSubType.compare("vmware.nvme.controller", RTCString::CaseInsensitive) == 0 )
+                        {
+                            HardDiskController hdc;
+                            hdc.system = HardDiskController::NVMe;
+                            hdc.strIdController = i.strInstanceID;
+                            //<rasd:ResourceSubType>NVMe</rasd:ResourceSubType>
+                            hdc.strControllerType = i.strResourceSubType;
+                            vsys.mapControllers[i.strInstanceID] = hdc;
+                        }
                         else
-                            throw OVFLogicError(N_("Error reading \"%s\": Host resource of type \"Other Storage Device (%d)\" is supported with SATA AHCI or virtio-scsi controllers only, line %d (subtype:%s)"),
+                            throw OVFLogicError(N_("Error reading \"%s\": Host resource of type \"Other Storage Device (%d)\" is supported with SATA AHCI or Virtio-SCSI or NVMe controllers only, line %d (subtype:%s)"),
                                                 m_strPath.c_str(),
                                                 ResourceType_OtherStorageDevice,