Changeset 90424 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 30, 2021 12:41:38 PM (4 years ago)

Author:

vboxsync

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

146024

Message:

Main/Appliance: Allow arbitrary unique resource IDs, not just integers. The OVF spec examples and the vast majority of OVF files use purely integers (and appliance export in VirtualBox also uses integers), but the type declaration allows any string.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• src-server/ApplianceImpl.cpp (modified) (2 diffs)
• src-server/ApplianceImplImport.cpp (modified) (13 diffs)

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -306 +306 @@
 
     std::list<VirtualSystemDescriptionEntry*> i_findByType(VirtualSystemDescriptionType_T aType);
-    const VirtualSystemDescriptionEntry* i_findControllerFromID(uint32_t id);
+    const VirtualSystemDescriptionEntry* i_findControllerFromID(const Utf8Str &id);
 
     void i_importVBoxMachineXML(const xml::ElementNode &elmMachine);

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

@@ -1757 +1757 @@
  * virtual disk.
  */
-const VirtualSystemDescriptionEntry* VirtualSystemDescription::i_findControllerFromID(uint32_t id)
-{
-    Utf8Str strRef = Utf8StrFmt("%RI32", id);
+const VirtualSystemDescriptionEntry* VirtualSystemDescription::i_findControllerFromID(const Utf8Str &id)
+{
     vector<VirtualSystemDescriptionEntry>::const_iterator it;
     for (it = m->maDescriptions.begin();
@@ -1773 +1772 @@
             case VirtualSystemDescriptionType_HardDiskControllerVirtioSCSI:
             case VirtualSystemDescriptionType_HardDiskControllerSAS:
-                if (d.strRef == strRef)
+                if (d.strRef == id)
                     return &d;
                 break;

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

@@ -511 +511 @@
                     }
 #endif /* VBOX_WITH_E1000 */
+                    else if (   !ea.strAdapterType.compare("VirtioNet", Utf8Str::CaseInsensitive)
+                             || !ea.strAdapterType.compare("virtio-net", Utf8Str::CaseInsensitive)
+                             || !ea.strAdapterType.compare("3", Utf8Str::CaseInsensitive))
+                        nwAdapterVBox = NetworkAdapterType_Virtio;
 
                     pNewDesc->i_addEntry(VirtualSystemDescriptionType_NetworkAdapter,
@@ -572 +576 @@
             {
                 const ovf::HardDiskController &hdc = hdcIt->second;
-                Utf8Str strControllerID = Utf8StrFmt("%RI32", (uint32_t)hdc.idController);
 
                 switch (hdc.system)
@@ -588 +591 @@
                                 strType = "ICH6";
                             pNewDesc->i_addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE,
-                                                 strControllerID,         // strRef
-                                                 hdc.strControllerType,   // aOvfValue
-                                                 strType);                // aVBoxValue
+                                                 hdc.strIdController,       // strRef
+                                                 hdc.strControllerType,     // aOvfValue
+                                                 strType);                  // aVBoxValue
                         }
                         else
@@ -609 +612 @@
                             /* We only support a plain AHCI controller, so use them always */
                             pNewDesc->i_addEntry(VirtualSystemDescriptionType_HardDiskControllerSATA,
-                                                 strControllerID,
+                                                 hdc.strIdController,
                                                  hdc.strControllerType,
                                                  "AHCI");
@@ -640 +643 @@
                                 hdcController = "BusLogic";
                             pNewDesc->i_addEntry(vsdet,
-                                                 strControllerID,
+                                                 hdc.strIdController,
                                                  hdc.strControllerType,
                                                  hdcController);
@@ -650 +653 @@
                                             vsysThis.strName.c_str(),
                                             hdc.strControllerType.c_str(),
-                                            strControllerID.c_str());
+                                            hdc.strIdController.c_str());
                         ++cSCSIused;
                     break;
@@ -659 +662 @@
                         {
                             pNewDesc->i_addEntry(VirtualSystemDescriptionType_HardDiskControllerVirtioSCSI,
-                                                 strControllerID,
+                                                 hdc.strIdController,
                                                  hdc.strControllerType,
                                                  "VirtioSCSI");
@@ -753 +756 @@
 
                     /* find the description for the storage controller
-                     * that has the same ID as hd.idController */
+                     * that has the same ID as hd.strIdController */
                     const VirtualSystemDescriptionEntry *pController;
-                    if (!(pController = pNewDesc->i_findControllerFromID(hd.idController)))
+                    if (!(pController = pNewDesc->i_findControllerFromID(hd.strIdController)))
                         throw setError(E_FAIL,
-                                       tr("Cannot find storage controller with OVF instance ID %RI32 "
+                                       tr("Cannot find storage controller with OVF instance ID \"%s\" "
                                           "to which medium \"%s\" should be attached"),
-                                       hd.idController,
+                                       hd.strIdController,
                                        di.strHref.c_str());
 
@@ -1317 +1320 @@
 
     int vrc = VINF_SUCCESS;
+    /** @todo r=klaus This should be a MultiResult, because this can cause
+     * multiple errors and warnings which should be relevant for the caller.
+     * Needs some work, because there might be errors which need to be
+     * excluded if they happen in error recovery code paths. */
     HRESULT hrc = S_OK;
     bool fKeepDownloadedObject = false;//in the future should be passed from the caller
@@ -1789 +1796 @@
                     //It's thought that SATA is supported by any OS types
                     hdc.system = ovf::HardDiskController::SATA;
-                    hdc.idController = 0;
+                    hdc.strIdController = "0";
 
                     GET_VSD_DESCRIPTION_BY_TYPE(VirtualSystemDescriptionType_HardDiskControllerSATA)//aVBoxValues is set in this #define
@@ -1798 +1805 @@
 
                     LogRel(("%s: Hard disk controller type is %s\n", __FUNCTION__, hdc.strControllerType.c_str()));
-                    vsys.mapControllers[hdc.idController] = hdc;
+                    vsys.mapControllers[hdc.strIdController] = hdc;
 
                     if (aVBoxValues.size() == 0)
@@ -2030 +2037 @@
 
                             ovf::VirtualDisk vd;
-                            vd.idController = vsys.mapControllers[0].idController;
+                            vd.strIdController = vsys.mapControllers[0].strIdController;
                             vd.ulAddressOnParent = 0;
                             vd.strDiskId = d.strDiskId;
@@ -5019 +5026 @@
 
                 // find the hard disk controller to which we should attach
-                ovf::HardDiskController hdc = (*vsysThis.mapControllers.find(ovfVdisk.idController)).second;
+                ovf::HardDiskController hdc = (*vsysThis.mapControllers.find(ovfVdisk.strIdController)).second;
 
                 // this is for rollback later