Changeset 68917 in vbox for trunk/src/VBox/Main/include

Timestamp:

Sep 28, 2017 4:09:25 PM (8 years ago)

Author:

vboxsync

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

118180

Message:

main/ovfreader: Ignore invalid InstanceID on Items where it doesn't matter. Fixes problem importing OVA containing placeholder string instead of number for the 'Memory' item. bugref:8997 Also fixed bogus EthernetPortItem and StorageItem object handling, instances would always be stripped down to VirtualHardwareItem after parsing and checking. Cleaned up the item parsing, reducing code duplication. Also reduced the excessive object copying during parsing a little.

File:

• trunk/src/VBox/Main/include/ovfreader.h (modified) (3 diffs)

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

@@ -23 +23 @@
 #include "iprt/cpp/xml.h"
 #include <map>
+#include <vector>
 
 namespace ovf
@@ -492 +493 @@
 struct VirtualSystem;
 
-typedef std::map<uint32_t, VirtualHardwareItem> HardwareItemsMap;
+
+/**
+ * VirtualHardwareItem pointer vector with safe cleanup.
+ *
+ * We need to use object pointers because we also want EthernetPortItem and
+ * StorageItems to go into the container.
+ */
+class HardwareItemVector : public std::vector<VirtualHardwareItem *>
+{
+public:
+    HardwareItemVector() : std::vector<VirtualHardwareItem *>() { }
+    ~HardwareItemVector()
+    {
+        for (iterator it = begin(); it != end(); ++it)
+            delete(*it);
+        clear();
+    }
+
+    /* There is no copying of this vector.  We'd need something like shared_ptr for that. */
+private:
+    HardwareItemVector(const VirtualSystem &);
+
+};
 
 struct HardDiskController
@@ -564 +587 @@
                                                 // VMware Workstation 6.5 is "vmx-07"
 
-    HardwareItemsMap    mapHardwareItems;       // map of virtual hardware items, sorted by unique instance ID
+    HardwareItemVector  vecHardwareItems;       //< vector containing all virtual hardware items in parsing order.
 
     uint64_t            ullMemorySize;          // always in bytes, copied from llHardwareItems; default = 0 (unspecified)