Changeset 101472 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

Timestamp:

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

Author:

vboxsync

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/src-server/ApplianceImplImport.cpp (modified) (9 diffs)

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

@@ -419 +419 @@
 
                 const settings::NetworkAdaptersList &llNetworkAdapters = pNewDesc->m->pConfig->hardwareMachine.llNetworkAdapters;
-                /* Check for the constrains */
+                /* Check for the constraints */
                 if (llNetworkAdapters.size() > maxNetworkAdapters)
                     i_addWarning(tr("Virtual appliance \"%s\" was configured with %zu network adapters however "
@@ -449 +449 @@
                 uint32_t const maxNetworkAdapters = PlatformProperties::s_getMaxNetworkAdapters(ChipsetType_PIIX3); /** @todo BUGBUG x86 only for now. */
 
-                /* Check for the constrains */
+                /* Check for the constraints */
                 if (cEthernetAdapters > maxNetworkAdapters)
                     i_addWarning(tr("Virtual appliance \"%s\" was configured with %zu network adapters however "
@@ -582 +582 @@
             uint16_t cSCSIused = 0; NOREF(cSCSIused);
             uint16_t cVIRTIOSCSIused = 0; NOREF(cVIRTIOSCSIused);
+            uint16_t cNVMeused = 0; NOREF(cNVMeused);
 
             ovf::ControllersMap::const_iterator hdcIt;
@@ -594 +595 @@
                 {
                     case ovf::HardDiskController::IDE:
-                        /* Check for the constrains */
+                        /* Check for the constraints */
                         if (cIDEused < 4)
                         {
@@ -621 +622 @@
 
                     case ovf::HardDiskController::SATA:
-                        /* Check for the constrains */
+                        /* Check for the constraints */
                         if (cSATAused < 1)
                         {
@@ -645 +646 @@
 
                     case ovf::HardDiskController::SCSI:
-                        /* Check for the constrains */
+                        /* Check for the constraints */
                         if (cSCSIused < 1)
                         {
@@ -674 +675 @@
 
                     case ovf::HardDiskController::VIRTIOSCSI:
-                        /* Check for the constrains */
+                        /* Check for the constraints */
                         if (cVIRTIOSCSIused < 1)
                         {
@@ -693 +694 @@
                         }
                         ++cVIRTIOSCSIused;
+                    break;
+
+                    case ovf::HardDiskController::NVMe:
+                        /* Check for the constraints */
+                        if (cNVMeused < 1)
+                        {
+                            pNewDesc->i_addEntry(VirtualSystemDescriptionType_HardDiskControllerNVMe,
+                                                 hdc.strIdController,
+                                                 hdc.strControllerType,
+                                                 "NVMe");
+                        }
+                        else
+                        {
+                            /* Warn only once */
+                            if (cNVMeused == 1)
+                                i_addWarning(tr("Virtual appliance \"%s\" was configured with more than one "
+                                                "NVMe controller however VirtualBox supports a maximum "
+                                                "of one NVMe controller."),
+                                                vsysThis.strName.c_str());
+
+                        }
+                        ++cNVMeused;
                     break;
 
@@ -4856 +4879 @@
     }
 
+    /* Storage controller NVMe */
+    std::list<VirtualSystemDescriptionEntry*> vsdeHDCNVMe =
+        vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskControllerNVMe);
+    if (vsdeHDCNVMe.size() > 1)
+        throw setError(VBOX_E_FILE_ERROR,
+                       tr("Too many NVMe controllers in OVF; import facility only supports one"));
+    if (!vsdeHDCNVMe.empty())
+    {
+        ComPtr<IStorageController> pController;
+        Utf8Str strName("NVMe");
+        const Utf8Str &hdcVBox = vsdeHDCNVMe.front()->strVBoxCurrent;
+        if (hdcVBox == "NVMe")
+        {
+            hrc = pNewMachine->AddStorageController(Bstr(strName).raw(), StorageBus_PCIe, pController.asOutParam());
+            if (FAILED(hrc)) throw hrc;
+
+            hrc = pController->COMSETTER(ControllerType)(StorageControllerType_NVMe);
+            if (FAILED(hrc)) throw hrc;
+        }
+        else
+            throw setError(VBOX_E_FILE_ERROR, tr("Invalid NVMe controller type \"%s\""), hdcVBox.c_str());
+    }
+
     /* Now its time to register the machine before we add any storage devices */
     hrc = mVirtualBox->RegisterMachine(pNewMachine);