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

Timestamp:

Oct 17, 2023 11:45:00 AM (16 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

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ApplianceImplExport.cpp (modified) (10 diffs)
• ApplianceImplImport.cpp (modified) (9 diffs)

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

@@ -1872 +1872 @@
             case VirtualSystemDescriptionType_HardDiskControllerSCSI:
             case VirtualSystemDescriptionType_HardDiskControllerVirtioSCSI:
+            case VirtualSystemDescriptionType_HardDiskControllerNVMe:
             case VirtualSystemDescriptionType_HardDiskControllerSAS:
                 if (d.strRef == id)

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

@@ -205 +205 @@
         int32_t lSCSIControllerIndex = 0;
         int32_t lVirtioSCSIControllerIndex = 0;
+        int32_t lNVMeControllerIndex = 0;
 
         /* Fetch all available storage controllers */
@@ -214 +215 @@
         ComPtr<IStorageController> pSATAController;
         ComPtr<IStorageController> pSCSIController;
+        ComPtr<IStorageController> pSASController;
         ComPtr<IStorageController> pVirtioSCSIController;
-        ComPtr<IStorageController> pSASController;
+        ComPtr<IStorageController> pNVMeController;
         for (size_t j = 0; j < nwControllers.size(); ++j)
         {
@@ -236 +238 @@
                      && pVirtioSCSIController.isNull())
                 pVirtioSCSIController = nwControllers[j];
+            else if (   eType == StorageBus_PCIe
+                     && pNVMeController.isNull())
+                pNVMeController = nwControllers[j];
         }
 
@@ -338 +343 @@
         }
 
+        if (!pNVMeController.isNull())
+        {
+            Utf8Str strVBox = "NVMe";
+            lNVMeControllerIndex = (int32_t)pNewDesc->m->maDescriptions.size();
+            pNewDesc->i_addEntry(VirtualSystemDescriptionType_HardDiskControllerNVMe,
+                                 Utf8StrFmt("%d", lNVMeControllerIndex),
+                                 strVBox,
+                                 strVBox);
+        }
+
 //     <const name="HardDiskImage" value="9" />
 //     <const name="Floppy" value="18" />
@@ -390 +405 @@
                 else if ( storageBus == StorageBus_SAS)
                     strStBus = "SAS";
+                else if ( storageBus == StorageBus_PCIe)
+                    strStBus = "PCIe";
                 else if ( storageBus == StorageBus_VirtioSCSI)
                     strStBus = "VirtioSCSI";
@@ -574 +591 @@
                     break;
 
+                case StorageBus_PCIe:
+                    lChannelVsys = lChannel;        // should be between 0 and 255
+                    lControllerVsys = lNVMeControllerIndex;
+                    break;
+
                 case StorageBus_Floppy:
                     lChannelVsys = 0;
@@ -1535 +1557 @@
     uint32_t idVirtioSCSIController = 0;
     int32_t lVirtioSCSIControllerIndex = 0;
+    uint32_t idNVMeController = 0;
+    int32_t lNVMeControllerIndex = 0;
 
     uint32_t ulInstanceID = 1;
@@ -1557 +1581 @@
                           : desc.type == VirtualSystemDescriptionType_HardDiskControllerSCSI ? "HardDiskControllerSCSI"
                           : desc.type == VirtualSystemDescriptionType_HardDiskControllerSAS ? "HardDiskControllerSAS"
+                          : desc.type == VirtualSystemDescriptionType_HardDiskControllerNVMe ? "HardDiskControllerNVMe"
                           : desc.type == VirtualSystemDescriptionType_HardDiskImage ? "HardDiskImage"
                           : Utf8StrFmt("%d", desc.type).c_str()),
@@ -1773 +1798 @@
                     break;
 
+                case VirtualSystemDescriptionType_HardDiskControllerNVMe:
+                    /*  <Item>
+                            <rasd:Caption>NVMeController0</rasd:Caption>
+                            <rasd:Description>NVMe Controller</rasd:Description>
+                            <rasd:InstanceId>4</rasd:InstanceId>
+                            <rasd:ResourceType>20</rasd:ResourceType>
+                            <rasd:Address>0</rasd:Address>
+                            <rasd:BusNumber>0</rasd:BusNumber>
+                        </Item>
+                    */
+                    if (uLoop == 1)
+                    {
+                        strDescription = "NVMe Controller";
+                        strCaption = "nvmeController0";
+                        type = ovf::ResourceType_OtherStorageDevice; // 20
+                        lAddress = 0;
+                        lBusNumber = 0;
+                        strResourceSubType = "NVMe";
+                        // remember this ID
+                        idNVMeController = ulInstanceID;
+                        lNVMeControllerIndex = lIndexThis;
+                    }
+                    break;
+
                 case VirtualSystemDescriptionType_HardDiskImage:
                     /*  <Item>
@@ -1811 +1860 @@
                             else if (lControllerIndex == lVirtioSCSIControllerIndex)
                                 ulParent = idVirtioSCSIController;
+                            else if (lControllerIndex == lNVMeControllerIndex)
+                                ulParent = idNVMeController;
                         }
                         if (pos2 != Utf8Str::npos)

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);