Changeset 28098 in vbox for trunk/src/VBox/Main/xml/Settings.cpp

Timestamp:

Apr 8, 2010 3:35:38 PM (15 years ago)

Author:

vboxsync

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

59814

Message:

Main: don't export snapshots in OVF, separate OVF import from vbox:Machine import

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

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

@@ -3693 +3693 @@
 /**
  * Builds the XML DOM tree for the machine config under the given XML element.
+ *
  * This has been separated out from write() so it can be called from elsewhere,
  * such as the OVF code, to build machine XML in an existing XML tree.
- * @param elmMachine
- */
-void MachineConfigFile::buildMachineXML(xml::ElementNode &elmMachine)
+ *
+ * As a result, this gets called from two locations:
+ *
+ *  --  MachineConfigFile::write();
+ *
+ *  --  Appliance::buildXMLForOneVirtualSystem()
+ *
+ * @param elmMachine XML <Machine> element to add attributes and elements to.
+ * @param fWriteSnapshots If false, we omit snapshots entirely (we don't recurse then).
+ */
+void MachineConfigFile::buildMachineXML(xml::ElementNode &elmMachine,
+                                        bool fIncludeSnapshots)
 {
     elmMachine.setAttribute("uuid", makeString(uuid));
@@ -3708 +3718 @@
     if (strStateFile.length())
         elmMachine.setAttribute("stateFile", strStateFile);
-    if (!uuidCurrentSnapshot.isEmpty())
+    if (fIncludeSnapshots && !uuidCurrentSnapshot.isEmpty())
         elmMachine.setAttribute("currentSnapshot", makeString(uuidCurrentSnapshot));
     if (strSnapshotFolder.length())
@@ -3734 +3744 @@
     writeExtraData(elmMachine, mapExtraDataItems);
 
-    if (llFirstSnapshot.size())
+    if (fIncludeSnapshots && llFirstSnapshot.size())
         buildSnapshotXML(elmMachine, llFirstSnapshot.front());
 
@@ -3901 +3911 @@
 
         xml::ElementNode *pelmMachine = m->pelmRoot->createChild("Machine");
-        buildMachineXML(*pelmMachine);
+        buildMachineXML(*pelmMachine,
+                        true /* fIncludeSnapshots */);
 
         // now go write the XML