Changeset 50444 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 13, 2014 12:22:13 PM (11 years ago)

Author:

vboxsync

Message:

pr7197. Deleting unneeded CDROMs from export configuration was replaced by skipping them.

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ApplianceImplExport.cpp (modified) (4 diffs)

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

@@ -1484 +1484 @@
     vsde.ulSizeMB = ulSizeMB;
 
+    vsde.skipIt = false;
+
     m->maDescriptions.push_back(vsde);
 }

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

@@ -611 +611 @@
         {
             ComObjPtr<VirtualSystemDescription> vsdescThis = (*it);
-            vsdescThis->i_removeByType(VirtualSystemDescriptionType_CDROM);
+            std::list<VirtualSystemDescriptionEntry*> skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_CDROM);
+            std::list<VirtualSystemDescriptionEntry*>:: iterator pItSkipped = skipped.begin();
+            while (pItSkipped != skipped.end())
+            {
+                (*pItSkipped)->skipIt = true;
+                ++pItSkipped;
+            }
         }
     }
@@ -888 +894 @@
 
         //skip empty Medium. There are no information to add into section <References> or <DiskSection>
-        if (strSrcFilePath.isEmpty())
+        if (strSrcFilePath.isEmpty() ||
+            pDiskEntry->skipIt == true)
             continue;
 
@@ -1518 +1525 @@
 
                         //skip empty Medium. There are no information to add into section <References> or <DiskSection>
-                        if (desc.strVBoxCurrent.isNotEmpty())
+                        if (desc.strVBoxCurrent.isNotEmpty() &&
+                            desc.skipIt == false)
                         {
                             // the following references the "<Disks>" XML block
@@ -2078 +2086 @@
 
             //skip empty Medium. In common, It's may be empty CD/DVD
-            if (strSrcFilePath.isEmpty())
+            if (strSrcFilePath.isEmpty() ||
+                pDiskEntry->skipIt == true)
                 continue;