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

Timestamp:

Jan 31, 2017 10:13:27 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8743. Workaround - fixed logic for putting the virtual disks in appropriate sequence during export. And another one small bug was fixed.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImplPrivate.h (modified) (1 diff)
• src-server/ApplianceImplExport.cpp (modified) (8 diffs)
• src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -236 +236 @@
 {
     std::map<Utf8Str, const VirtualSystemDescriptionEntry*> mapDisks;
+    std::list<Utf8Str> mapDiskSequence;
     std::map<Utf8Str, bool> mapNetworks;
 };

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

@@ -350 +350 @@
 
                 Utf8Str strName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
-                strTargetImageName = Utf8StrFmt("%s-disk%d.vmdk", strName.c_str(), ++pAppliance->m->cDisks);
+                strTargetImageName = Utf8StrFmt("%s-disk%.3d.vmdk", strName.c_str(), ++pAppliance->m->cDisks);
                 if (strTargetImageName.length() > RTTAR_NAME_MAX)
                     throw setError(VBOX_E_NOT_SUPPORTED,
@@ -442 +442 @@
 
                 Utf8Str strName = Utf8Str(locInfo.strPath).stripPath().stripSuffix();
-                strTargetImageName = Utf8StrFmt("%s-disk%d.iso", strName.c_str(), ++pAppliance->m->cDisks);
+                strTargetImageName = Utf8StrFmt("%s-disk%.3d.iso", strName.c_str(), ++pAppliance->m->cDisks);
                 if (strTargetImageName.length() > RTTAR_NAME_MAX)
                     throw setError(VBOX_E_NOT_SUPPORTED,
@@ -936 +936 @@
     // Finally, write out the disk info
     list<Utf8Str> diskList;
-    map<Utf8Str, const VirtualSystemDescriptionEntry*>::const_iterator itS;
     uint32_t ulFile = 1;
-    for (itS = stack.mapDisks.begin();
-         itS != stack.mapDisks.end();
+    list<Utf8Str>::const_iterator itS;
+
+    for (itS = stack.mapDiskSequence.begin();
+         itS != stack.mapDiskSequence.end();
          ++itS)
     {
-        const Utf8Str &strDiskID = itS->first;
-        const VirtualSystemDescriptionEntry *pDiskEntry = itS->second;
+        const Utf8Str &strDiskID = *itS;
+        const VirtualSystemDescriptionEntry *pDiskEntry = stack.mapDisks[strDiskID];
 
         // source path: where the VBox image is
@@ -1019 +1020 @@
         // <File ovf:href="WindowsXpProfessional-disk1.vmdk" ovf:id="file1" ovf:size="1710381056"/>
         xml::ElementNode *pelmFile = pelmReferences->createChild("File");
+        pelmFile->setAttribute("ovf:id", strFileRef);
         pelmFile->setAttribute("ovf:href", strTargetFileNameOnly);
-        pelmFile->setAttribute("ovf:id", strFileRef);
         /// @todo the actual size is not available at this point of time,
         // cause the disk will be compressed. The 1.0 standard says this is
@@ -1548 +1549 @@
 
                         stack.mapDisks[strDiskID] = &desc;
+
+                        //use the list stack.mapDiskSequence where the disks go as the "VirtualSystem" should be placed
+                        //in the OVF description file.
+                        stack.mapDiskSequence.push_back(strDiskID);
                     }
                     break;
@@ -1573 +1578 @@
                     if (uLoop == 2)
                     {
-                        //uint32_t cDisks = stack.mapDisks.size();
-                        Utf8Str strDiskID = Utf8StrFmt("iso%RI32", ++cDVDs);
-
+                        uint32_t cDisks = (uint32_t)stack.mapDisks.size();
+                        Utf8Str strDiskID = Utf8StrFmt("iso%RI32", ++cDisks);
+                        ++cDVDs;
                         strDescription = "CD-ROM Drive";
                         strCaption = Utf8StrFmt("cdrom%RI32", cDVDs);     // OVFTool starts with 1
@@ -1620 +1625 @@
 
                         stack.mapDisks[strDiskID] = &desc;
+
+                        //use the list stack.mapDiskSequence where the disks go as the "VirtualSystem" should be placed
+                        //in the OVF description file.
+                        stack.mapDiskSequence.push_back(strDiskID);
                         // there is no DVD drive map to update because it is
                         // handled completely with this entry.
@@ -2149 +2158 @@
 
         // Finally, write out the disks!
-        map<Utf8Str, const VirtualSystemDescriptionEntry*>::const_iterator itS;
-        for (itS = stack.mapDisks.begin();
-             itS != stack.mapDisks.end();
-             ++itS)
-        {
-            const VirtualSystemDescriptionEntry *pDiskEntry = itS->second;
+        //use the list stack.mapDiskSequence where the disks were put as the "VirtualSystem"s had been placed
+        //in the OVF description file. I.e. we have one "VirtualSystem" in the OVF file, we extract all disks
+        //attached to it. And these disks are stored in the stack.mapDiskSequence. Next we shift to the next
+        //"VirtualSystem" and repeat the operation.
+        //And here we go through the list and extract all disks in the same sequence
+        list<Utf8Str>::const_iterator itS;
+        for (itS = stack.mapDiskSequence.begin();
+              itS != stack.mapDiskSequence.end();
+              ++itS)
+        {
+            const Utf8Str &strDiskID = *itS;
+            const VirtualSystemDescriptionEntry *pDiskEntry = stack.mapDisks[strDiskID];
 
             // source path: where the VBox image is

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

@@ -3758 +3758 @@
                      * disks description using the found disk image
                      */
+                    vsdeTargetHD = NULL;
                     for (list<VirtualSystemDescriptionEntry*>::const_iterator itHD = avsdeHDs.begin();
                          itHD != avsdeHDs.end();