Changeset 35536 in vbox for trunk

Timestamp:

Jan 13, 2011 3:12:10 PM (14 years ago)

Author:

vboxsync

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

69420

Message:

Main-OVF: ignore unknown resource types which are declared not required

Location:

trunk/src/VBox/Main

Files:

• include/ovfreader.h (modified) (1 diff)
• xml/ovfreader.cpp (modified) (2 diffs)

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

@@ -217 +217 @@
     iprt::MiniString strOtherResourceType;
     iprt::MiniString strResourceSubType;
+    bool fResourceRequired;
 
     iprt::MiniString strHostResource;   // "Abstractly specifies how a device shall connect to a resource on the deployment platform.

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

@@ -423 +423 @@
                         pelmItemChild->copyValue(ulType);
                         i.resourceType = (ResourceType_T)ulType;
+                        i.fResourceRequired = true;
+                        const char *pcszAttValue;
+                        if (pelmItem->getAttributeValue("required", pcszAttValue))
+                        {
+                            if (!strcmp(pcszAttValue, "false"))
+                                i.fResourceRequired = false;
+                        }
                     }
                     else if (!strcmp(pcszItemChildName, "OtherResourceType"))
@@ -691 +698 @@
 
                     default:
-                        throw OVFLogicError(N_("Error reading \"%s\": Unknown resource type %d in hardware item, line %d"),
-                                            m_strPath.c_str(),
-                                            i.resourceType,
-                                            i.ulLineNumber);
+                    {
+                        /* If this unknown resource type isn't required, we simply skip it. */
+                        if (i.fResourceRequired)
+                        {
+                            throw OVFLogicError(N_("Error reading \"%s\": Unknown resource type %d in hardware item, line %d"),
+                                                m_strPath.c_str(),
+                                                i.resourceType,
+                                                i.ulLineNumber);
+                        }
+                    }
                 } // end switch
             }