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

Timestamp:

Jul 30, 2021 4:25:55 PM (3 years ago)

Author:

vboxsync

Message:

Main/ovfreader.cpp: Another forgotten file, again related to string ID.

File:

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

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

@@ -84 +84 @@
 
     if (!pRootElem || strcmp(pRootElem->getName(), "Envelope"))
-        throw OVFLogicError(N_("Root element in OVF file must be \"Envelope\"."));
+        throw OVFLogicError(N_("Root element in OVF file must be 'Envelope'."));
 
     pcszNamespaceURI = pRootElem->getNamespaceURI();
-    if(pcszNamespaceURI.isEmpty())
+    if (pcszNamespaceURI.isEmpty())
     {
         throw OVFLogicError(N_("Error reading namespace URI in 'Envelope' element, line %d"), pRootElem->getLineNumber());
@@ -277 +277 @@
                 }
                 else
-                    throw OVFLogicError(N_("Error reading \"%s\": cannot find References/File element for ID '%s' referenced by 'Disk' element, line %d"),
+                    throw OVFLogicError(N_("Error reading \"%s\": cannot find References/File element for ID \"%s\" referenced by 'Disk' element, line %d"),
                                         m_strPath.c_str(),
                                         pcszFileRef,
@@ -364 +364 @@
                 pcszTypeAttr = pTypeAttr->getValueN(RT_XML_ATTR_TINY);
             else
-                throw OVFLogicError(N_("Error reading \"%s\": element \"Section\" has no \"type\" attribute, line %d"),
+                throw OVFLogicError(N_("Error reading \"%s\": element 'Section' has no 'type' attribute, line %d"),
                                     m_strPath.c_str(),
                                     pelmThis->getLineNumber());
@@ -430 +430 @@
             /* Parse the items into the hardware item vector. */
             {
-                std::map<uint32_t, const VirtualHardwareItem *> mapHardwareItems;
+                std::map<RTCString, const VirtualHardwareItem *> mapHardwareItems;
                 xml::NodesLoop childrenIterator(*pelmThis);
                 const xml::ElementNode *pelmItem;
@@ -461 +461 @@
 
                     /* Add to mapping vector (for parent ID lookups) if it has a valid instance ID. */
-                    if (pItem->ulInstanceID != 0)
+                    if (!pItem->strInstanceID.isEmpty())
                     {
-                        std::map<uint32_t, const VirtualHardwareItem *>::const_iterator itDup;
-                        itDup = mapHardwareItems.find(pItem->ulInstanceID);
+                        std::map<RTCString, const VirtualHardwareItem *>::const_iterator itDup;
+                        itDup = mapHardwareItems.find(pItem->strInstanceID);
                         if (itDup == mapHardwareItems.end())
-                            mapHardwareItems[pItem->ulInstanceID] = pItem;
+                            mapHardwareItems[pItem->strInstanceID] = pItem;
                         else
 #if 1
-                            LogRel(("OVFREADER: Warning reading '%s'! Duplicate ulInstanceID %u on line %d, previous at %d!\n",
-                                    m_strPath.c_str(), pItem->ulInstanceID, pItem->m_iLineNumber, itDup->second->m_iLineNumber));
+                            LogRel(("OVFREADER: Warning reading \"%s\": Duplicate InstanceID \"%s\" on line %d, previous at %d!\n",
+                                    m_strPath.c_str(), pItem->strInstanceID.c_str(), pItem->m_iLineNumber, itDup->second->m_iLineNumber));
 #else
-                            throw OVFLogicError(N_("Error reading '%s': Duplicate ulInstanceID %u on line %d, previous at %d"),
-                                                m_strPath.c_str(), pItem->ulInstanceID,
+                            throw OVFLogicError(N_("Error reading \"%s\": Duplicate InstanceID \"%s\" on line %d, previous at %d"),
+                                                m_strPath.c_str(), pItem->strInstanceID.c_str(),
                                                 pItem->m_iLineNumber, itDup->second->m_iLineNumber);
 #endif
@@ -535 +535 @@
                         HardDiskController hdc;
                         hdc.system = HardDiskController::IDE;
-                        hdc.idController = i.ulInstanceID;
+                        hdc.strIdController = i.strInstanceID;
                         hdc.strControllerType = i.strResourceSubType;
 
@@ -567 +567 @@
                         }
 
-                        vsys.mapControllers[i.ulInstanceID] = hdc;
+                        vsys.mapControllers[i.strInstanceID] = hdc;
                         if (!pPrimaryIDEController)
-                            pPrimaryIDEController = &vsys.mapControllers[i.ulInstanceID];
+                            pPrimaryIDEController = &vsys.mapControllers[i.strInstanceID];
                         break;
                     }
@@ -585 +585 @@
                         HardDiskController hdc;
                         hdc.system = HardDiskController::SCSI;
-                        hdc.idController = i.ulInstanceID;
+                        hdc.strIdController = i.strInstanceID;
                         hdc.strControllerType = i.strResourceSubType;
 
-                        vsys.mapControllers[i.ulInstanceID] = hdc;
+                        vsys.mapControllers[i.strInstanceID] = hdc;
                         break;
                     }
@@ -657 +657 @@
                             HardDiskController hdc;
                             hdc.system = HardDiskController::SATA;
-                            hdc.idController = i.ulInstanceID;
+                            hdc.strIdController = i.strInstanceID;
                             hdc.strControllerType = i.strResourceSubType;
 
-                            vsys.mapControllers[i.ulInstanceID] = hdc;
+                            vsys.mapControllers[i.strInstanceID] = hdc;
                         }
-                        else if ( i.strResourceSubType.compare("VirtioSCSI", RTCString::CaseInsensitive) == 0 )
+                        else if (   i.strResourceSubType.compare("VirtioSCSI", RTCString::CaseInsensitive) == 0
+                                 || i.strResourceSubType.compare("virtio-scsi", RTCString::CaseInsensitive) == 0 )
                         {
                             HardDiskController hdc;
-                            hdc.system = HardDiskController::VIRTIOSCSI;
-                            hdc.idController = i.ulInstanceID;
+                            hdc.system = HardDiskController::VIRTIOSCSI; /**< r=klaus: GUI needs to learn about this in the import dialog, currently shown as "Unknown Hardware Item". */
+                            hdc.strIdController = i.strInstanceID;
                             //<rasd:ResourceSubType>VirtioSCSI</rasd:ResourceSubType>
                             hdc.strControllerType = i.strResourceSubType;
-                            vsys.mapControllers[i.ulInstanceID] = hdc;
+                            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 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 controllers only, line %d (subtype:%s)"),
                                                 m_strPath.c_str(),
                                                 ResourceType_OtherStorageDevice,
@@ -751 +752 @@
                         // look up the hard disk controller element whose InstanceID equals our Parent;
                         // this is how the connection is specified in OVF
-                        ControllersMap::const_iterator it = vsys.mapControllers.find(i.ulParent);
+                        ControllersMap::const_iterator it = vsys.mapControllers.find(i.strParent);
                         if (it == vsys.mapControllers.end())
-                            throw OVFLogicError(N_("Error reading \"%s\": Disk item with instance ID %d specifies invalid parent %d, line %d"),
+                            throw OVFLogicError(N_("Error reading \"%s\": Disk item with instance ID \"%s\" specifies invalid parent \"%s\", line %d"),
                                                 m_strPath.c_str(),
-                                                i.ulInstanceID,
-                                                i.ulParent,
+                                                i.strInstanceID.c_str(),
+                                                i.strParent.c_str(),
                                                 i.m_iLineNumber);
 
                         VirtualDisk vd;
-                        vd.idController = i.ulParent;
+                        vd.strIdController = i.strParent;
                         i.strAddressOnParent.toInt(vd.ulAddressOnParent);
                         // ovf://disk/lamp
@@ -774 +775 @@
                         if ((vd.strDiskId.isEmpty() || (m_mapDisks.find(vd.strDiskId) == m_mapDisks.end()))
                              && i.resourceType == ResourceType_HardDisk)
-                          throw OVFLogicError(N_("Error reading \"%s\": Disk item with instance ID %d specifies invalid host resource \"%s\", line %d"),
+                          throw OVFLogicError(N_("Error reading \"%s\": Disk item with instance ID \"%s\" specifies invalid host resource \"%s\", line %d"),
                                               m_strPath.c_str(),
-                                              i.ulInstanceID,
+                                              i.strInstanceID.c_str(),
                                               i.strHostResource.c_str(),
                                               i.m_iLineNumber);
@@ -834 +835 @@
         else if (   !strcmp(pcszItemChildName, "InstanceID")
                  || !strcmp(pcszItemChildName, "InstanceId") )
-            pelmItemChild->copyValue(ulInstanceID);
+            strInstanceID = pelmItemChild->getValueN(RT_XML_CONTENT_SMALL);
         else if (!strcmp(pcszItemChildName, "HostResource"))
             strHostResource = pelmItemChild->getValueN(RT_XML_CONTENT_SMALL);
@@ -841 +842 @@
             uint32_t ulType;
             pelmItemChild->copyValue(ulType);
+            if (ulType > 0xffff)
+                ulType = 0xffff;
             resourceType = (ResourceType_T)ulType;
             fResourceRequired = true;
@@ -859 +862 @@
             fAutomaticDeallocation = (!strcmp(pelmItemChild->getValueN(RT_XML_CONTENT_SMALL), "true")) ? true : false;
         else if (!strcmp(pcszItemChildName, "Parent"))
-            pelmItemChild->copyValue(ulParent);
+            strParent = pelmItemChild->getValueN(RT_XML_CONTENT_SMALL);
         else if (!strcmp(pcszItemChildName, "Connection"))
             strConnection = pelmItemChild->getValueN(RT_XML_CONTENT_SMALL);
@@ -889 +892 @@
 //      else if (pelmItemChild->getPrefix() == NULL
 //               || strcmp(pelmItemChild->getPrefix(), "vmw"))
-//          throw OVFLogicError(N_("Unknown element \"%s\" under Item element, line %d"),
+//          throw OVFLogicError(N_("Unknown element '%s' under Item element, line %d"),
 //                              pcszItemChildName,
 //                              m_iLineNumber);
@@ -902 +905 @@
                             name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
 
-    /* Don't be too uptight about the ulInstanceID value.  There are OVAs out
-       there which have ulInstanceID="%iid% for memory for instance, which is
+    /* Don't be too uptight about the strInstanceID value.  There are OVAs out
+       there which have InstanceID="%iid%" for memory for instance, which is
        no good reason for not being able to process them.  bugref:8997 */
-    if (ulInstanceID == 0)
+    if (strInstanceID.isEmpty())
     {
         if (   resourceType == ResourceType_IDEController
@@ -915 +918 @@
                                 name.c_str(), m_iLineNumber, DTMF_SPECS_URI);
         else
-            LogRel(("OVFREADER: Warning: Ignoring missing or invalid ulInstanceID under element %s, line %u\n",
+            LogRel(("OVFREADER: Warning: Ignoring missing or invalid InstanceID under element %s, line %u\n",
                     name.c_str(), m_iLineNumber));
     }