Changeset 65807 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

Timestamp:

Feb 20, 2017 10:28:47 AM (8 years ago)

Author:

vboxsync

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

113542

Message:

bugref:8743. Workaround for correct OVF export VMs which share one or more virtual disks among them. This issue is tied with the part <vbox:machine> in the OVF description file.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (5 diffs)

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

@@ -905 +905 @@
     // might have UUIDs that need fixing after we know the UUIDs of the exported images
     std::list<xml::ElementNode*> llElementsWithUuidAttributes;
-
+    uint32_t ulFile = 1;
     list< ComObjPtr<VirtualSystemDescription> >::const_iterator it;
     /* Iterate through all virtual systems of that appliance */
@@ -919 +919 @@
                                       enFormat,
                                       stack);         // disks and networks stack
+
+        list<Utf8Str> diskList;
+        list<Utf8Str>::const_iterator itS;
+
+        for (itS = stack.mapDiskSequenceForOneVM.begin();
+             itS != stack.mapDiskSequenceForOneVM.end();
+             ++itS)
+        {
+            const Utf8Str &strDiskID = *itS;
+            const VirtualSystemDescriptionEntry *pDiskEntry = stack.mapDisks[strDiskID];
+
+            // source path: where the VBox image is
+            const Utf8Str &strSrcFilePath = pDiskEntry->strVBoxCurrent;
+            Bstr bstrSrcFilePath(strSrcFilePath);
+
+            //skip empty Medium. There are no information to add into section <References> or <DiskSection>
+            if (strSrcFilePath.isEmpty() ||
+                pDiskEntry->skipIt == true)
+                continue;
+
+            // Do NOT check here whether the file exists. FindMedium will figure
+            // that out, and filesystem-based tests are simply wrong in the
+            // general case (think of iSCSI).
+
+            // We need some info from the source disks
+            ComPtr<IMedium> pSourceDisk;
+            //DeviceType_T deviceType = DeviceType_HardDisk;// by default
+
+            Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw()));
+
+            HRESULT rc;
+
+            if (pDiskEntry->type == VirtualSystemDescriptionType_HardDiskImage)
+            {
+                rc = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(),
+                                             DeviceType_HardDisk,
+                                             AccessMode_ReadWrite,
+                                             FALSE /* fForceNewUuid */,
+                                             pSourceDisk.asOutParam());
+                if (FAILED(rc))
+                    throw rc;
+            }
+            else if (pDiskEntry->type == VirtualSystemDescriptionType_CDROM)//may be, this is CD/DVD
+            {
+                rc = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(),
+                                             DeviceType_DVD,
+                                             AccessMode_ReadOnly,
+                                             FALSE,
+                                             pSourceDisk.asOutParam());
+                if (FAILED(rc))
+                    throw rc;
+            }
+
+            Bstr uuidSource;
+            rc = pSourceDisk->COMGETTER(Id)(uuidSource.asOutParam());
+            if (FAILED(rc)) throw rc;
+            Guid guidSource(uuidSource);
+
+            // output filename
+            const Utf8Str &strTargetFileNameOnly = pDiskEntry->strOvf;
+            // target path needs to be composed from where the output OVF is
+            Utf8Str strTargetFilePath(strPath);
+            strTargetFilePath.stripFilename();
+            strTargetFilePath.append("/");
+            strTargetFilePath.append(strTargetFileNameOnly);
+
+            // We are always exporting to VMDK stream optimized for now
+            //Bstr bstrSrcFormat = L"VMDK";//not used
+
+            diskList.push_back(strTargetFilePath);
+
+            LONG64 cbCapacity = 0;     // size reported to guest
+            rc = pSourceDisk->COMGETTER(LogicalSize)(&cbCapacity);
+            if (FAILED(rc)) throw rc;
+            /// @todo r=poetzsch: wrong it is reported in bytes ...
+            // capacity is reported in megabytes, so...
+            //cbCapacity *= _1M;
+
+            Guid guidTarget; /* Creates a new uniq number for the target disk. */
+            guidTarget.create();
+
+            // now handle the XML for the disk:
+            Utf8StrFmt strFileRef("file%RI32", ulFile++);
+            // <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);
+            /// @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
+            // optional! 1.1 isn't fully clear if the "gzip" format is used.
+            // Need to be checked. */
+            //            pelmFile->setAttribute("ovf:size", Utf8StrFmt("%RI64", cbFile).c_str());
+
+            // add disk to XML Disks section
+            // <Disk ovf:capacity="8589934592" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="..."/>
+            xml::ElementNode *pelmDisk = pelmDiskSection->createChild("Disk");
+            pelmDisk->setAttribute("ovf:capacity", Utf8StrFmt("%RI64", cbCapacity).c_str());
+            pelmDisk->setAttribute("ovf:diskId", strDiskID);
+            pelmDisk->setAttribute("ovf:fileRef", strFileRef);
+
+            if (pDiskEntry->type == VirtualSystemDescriptionType_HardDiskImage)//deviceType == DeviceType_HardDisk
+            {
+                pelmDisk->setAttribute("ovf:format",
+                                       (enFormat == ovf::OVFVersion_0_9)
+                                       ?  "http://www.vmware.com/specifications/vmdk.html#sparse"      // must be sparse or ovftoo
+                                       :  "http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"
+                                       // correct string as communicated to us by VMware (public bug #6612)
+                                      );
+            }
+            else //pDiskEntry->type == VirtualSystemDescriptionType_CDROM, deviceType == DeviceType_DVD
+            {
+                pelmDisk->setAttribute("ovf:format",
+                                       "http://www.ecma-international.org/publications/standards/Ecma-119.htm"
+                                      );
+            }
+
+            // add the UUID of the newly target image to the OVF disk element, but in the
+            // vbox: namespace since it's not part of the standard
+            pelmDisk->setAttribute("vbox:uuid", Utf8StrFmt("%RTuuid", guidTarget.raw()).c_str());
+
+            // now, we might have other XML elements from vbox:Machine pointing to this image,
+            // but those would refer to the UUID of the _source_ image (which we created the
+            // export image from); those UUIDs need to be fixed to the export image
+            Utf8Str strGuidSourceCurly = guidSource.toStringCurly();
+            for (std::list<xml::ElementNode*>::iterator eit = llElementsWithUuidAttributes.begin();
+                 eit != llElementsWithUuidAttributes.end();
+                 ++eit)
+            {
+                xml::ElementNode *pelmImage = *eit;
+                Utf8Str strUUID;
+                pelmImage->getAttributeValue("uuid", strUUID);
+                if (strUUID == strGuidSourceCurly)
+                    // overwrite existing uuid attribute
+                    pelmImage->setAttribute("uuid", guidTarget.toStringCurly());
+            }
+        }
+        llElementsWithUuidAttributes.clear();
+        stack.mapDiskSequenceForOneVM.clear();
     }
 
@@ -934 +1072 @@
     }
 
-    // Finally, write out the disk info
-    list<Utf8Str> diskList;
-    uint32_t ulFile = 1;
-    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
-        const Utf8Str &strSrcFilePath = pDiskEntry->strVBoxCurrent;
-        Bstr bstrSrcFilePath(strSrcFilePath);
-
-        //skip empty Medium. There are no information to add into section <References> or <DiskSection>
-        if (strSrcFilePath.isEmpty() ||
-            pDiskEntry->skipIt == true)
-            continue;
-
-        // Do NOT check here whether the file exists. FindMedium will figure
-        // that out, and filesystem-based tests are simply wrong in the
-        // general case (think of iSCSI).
-
-        // We need some info from the source disks
-        ComPtr<IMedium> pSourceDisk;
-        //DeviceType_T deviceType = DeviceType_HardDisk;// by default
-
-        Log(("Finding source disk \"%ls\"\n", bstrSrcFilePath.raw()));
-
-        HRESULT rc;
-
-        if (pDiskEntry->type == VirtualSystemDescriptionType_HardDiskImage)
-        {
-            rc = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(),
-                                         DeviceType_HardDisk,
-                                         AccessMode_ReadWrite,
-                                         FALSE /* fForceNewUuid */,
-                                         pSourceDisk.asOutParam());
-            if (FAILED(rc))
-                throw rc;
-        }
-        else if (pDiskEntry->type == VirtualSystemDescriptionType_CDROM)//may be, this is CD/DVD
-        {
-            rc = mVirtualBox->OpenMedium(bstrSrcFilePath.raw(),
-                                         DeviceType_DVD,
-                                         AccessMode_ReadOnly,
-                                         FALSE,
-                                         pSourceDisk.asOutParam());
-            if (FAILED(rc))
-                throw rc;
-        }
-
-        Bstr uuidSource;
-        rc = pSourceDisk->COMGETTER(Id)(uuidSource.asOutParam());
-        if (FAILED(rc)) throw rc;
-        Guid guidSource(uuidSource);
-
-        // output filename
-        const Utf8Str &strTargetFileNameOnly = pDiskEntry->strOvf;
-        // target path needs to be composed from where the output OVF is
-        Utf8Str strTargetFilePath(strPath);
-        strTargetFilePath.stripFilename();
-        strTargetFilePath.append("/");
-        strTargetFilePath.append(strTargetFileNameOnly);
-
-        // We are always exporting to VMDK stream optimized for now
-        //Bstr bstrSrcFormat = L"VMDK";//not used
-
-        diskList.push_back(strTargetFilePath);
-
-        LONG64 cbCapacity = 0;     // size reported to guest
-        rc = pSourceDisk->COMGETTER(LogicalSize)(&cbCapacity);
-        if (FAILED(rc)) throw rc;
-        /// @todo r=poetzsch: wrong it is reported in bytes ...
-        // capacity is reported in megabytes, so...
-        //cbCapacity *= _1M;
-
-        Guid guidTarget; /* Creates a new uniq number for the target disk. */
-        guidTarget.create();
-
-        // now handle the XML for the disk:
-        Utf8StrFmt strFileRef("file%RI32", ulFile++);
-        // <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);
-        /// @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
-        // optional! 1.1 isn't fully clear if the "gzip" format is used.
-        // Need to be checked. */
-        //            pelmFile->setAttribute("ovf:size", Utf8StrFmt("%RI64", cbFile).c_str());
-
-        // add disk to XML Disks section
-        // <Disk ovf:capacity="8589934592" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="..."/>
-        xml::ElementNode *pelmDisk = pelmDiskSection->createChild("Disk");
-        pelmDisk->setAttribute("ovf:capacity", Utf8StrFmt("%RI64", cbCapacity).c_str());
-        pelmDisk->setAttribute("ovf:diskId", strDiskID);
-        pelmDisk->setAttribute("ovf:fileRef", strFileRef);
-
-        if (pDiskEntry->type == VirtualSystemDescriptionType_HardDiskImage)//deviceType == DeviceType_HardDisk
-        {
-            pelmDisk->setAttribute("ovf:format",
-                                   (enFormat == ovf::OVFVersion_0_9)
-                                   ?  "http://www.vmware.com/specifications/vmdk.html#sparse"      // must be sparse or ovftool ch
-                                   :  "http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"
-                                   // correct string as communicated to us by VMware (public bug #6612)
-                                  );
-        }
-        else //pDiskEntry->type == VirtualSystemDescriptionType_CDROM, deviceType == DeviceType_DVD
-        {
-            pelmDisk->setAttribute("ovf:format",
-                                   "http://www.ecma-international.org/publications/standards/Ecma-119.htm"
-                                  );
-        }
-
-        // add the UUID of the newly target image to the OVF disk element, but in the
-        // vbox: namespace since it's not part of the standard
-        pelmDisk->setAttribute("vbox:uuid", Utf8StrFmt("%RTuuid", guidTarget.raw()).c_str());
-
-        // now, we might have other XML elements from vbox:Machine pointing to this image,
-        // but those would refer to the UUID of the _source_ image (which we created the
-        // export image from); those UUIDs need to be fixed to the export image
-        Utf8Str strGuidSourceCurly = guidSource.toStringCurly();
-        for (std::list<xml::ElementNode*>::iterator eit = llElementsWithUuidAttributes.begin();
-             eit != llElementsWithUuidAttributes.end();
-             ++eit)
-        {
-            xml::ElementNode *pelmImage = *eit;
-            Utf8Str strUUID;
-            pelmImage->getAttributeValue("uuid", strUUID);
-            if (strUUID == strGuidSourceCurly)
-                // overwrite existing uuid attribute
-                pelmImage->setAttribute("uuid", guidTarget.toStringCurly());
-        }
-    }
 }
 
@@ -1553 +1554 @@
                         //in the OVF description file.
                         stack.mapDiskSequence.push_back(strDiskID);
+                        stack.mapDiskSequenceForOneVM.push_back(strDiskID);
                     }
                     break;
@@ -1629 +1631 @@
                         //in the OVF description file.
                         stack.mapDiskSequence.push_back(strDiskID);
+                        stack.mapDiskSequenceForOneVM.push_back(strDiskID);
                         // there is no DVD drive map to update because it is
                         // handled completely with this entry.