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

Timestamp:

May 14, 2013 3:02:25 PM (12 years ago)

Author:

vboxsync

Message:

issue 5429. Support CD/DVD images attached to IDE/SATA during OVF import/export.

File:

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

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

@@ -745 +745 @@
                 switch (i.resourceType)
                 {
+                    case ResourceType_CDDrive: // 15
                     case ResourceType_HardDisk: // 17
                     {
@@ -761 +762 @@
                         ControllersMap::const_iterator it = vsys.mapControllers.find(i.ulParent);
                         if (it == vsys.mapControllers.end())
-                            throw OVFLogicError(N_("Error reading \"%s\": Hard disk item with instance ID %d specifies invalid parent %d, line %d"),
+                            throw OVFLogicError(N_("Error reading \"%s\": Disk item with instance ID %d specifies invalid parent %d, line %d"),
                                                 m_strPath.c_str(),
                                                 i.ulInstanceID,
                                                 i.ulParent,
                                                 i.ulLineNumber);
-                        //const HardDiskController &hdc = it->second;
 
                         VirtualDisk vd;
@@ -779 +779 @@
                         else if (i.strHostResource.startsWith("/disk/"))
                             vd.strDiskId = i.strHostResource.substr(6);
-
-                        if (    !(vd.strDiskId.length())
-                             || (m_mapDisks.find(vd.strDiskId) == m_mapDisks.end())
-                           )
-                            throw OVFLogicError(N_("Error reading \"%s\": Hard disk item with instance ID %d specifies invalid host resource \"%s\", line %d"),
-                                                m_strPath.c_str(),
-                                                i.ulInstanceID,
-                                                i.strHostResource.c_str(),
-                                                i.ulLineNumber);
+                        else
+                            vd.strDiskId = i.strElementName;//assign default name using value from the field
+                                                            //<rasd:ElementName>element name</rasd:ElementName>
+
+                      if ((!(vd.strDiskId.length())
+                          || (m_mapDisks.find(vd.strDiskId) == m_mapDisks.end()))
+                          )
+                          throw OVFLogicError(N_("Error reading \"%s\": Disk item with instance ID %d specifies invalid host resource \"%s\", line %d"),
+                                              m_strPath.c_str(),
+                                              i.ulInstanceID,
+                                              i.strHostResource.c_str(),
+                                              i.ulLineNumber);
 
                         vsys.mapVirtualDisks[vd.strDiskId] = vd;