Changeset 33661 in vbox

Timestamp:

Nov 1, 2010 3:05:54 PM (14 years ago)

Author:

vboxsync

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

67280

Message:

Main/OVF: never write the Machine/@stateFile attribute in machine XML when exporting OVF vbox:Machine, since we have no state

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Main/ApplianceImplExport.cpp (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -955 +955 @@
         BuildMachineXML_WriteVboxVersionAttribute = 0x02,
         BuildMachineXML_SkipRemovableMedia = 0x04,
-        BuildMachineXML_MediaRegistry = 0x08
+        BuildMachineXML_MediaRegistry = 0x08,
+        BuildMachineXML_SuppressSavedState = 0x10
     };
     void buildMachineXML(xml::ElementNode &elmMachine,

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1548 +1548 @@
         pConfig->buildMachineXML(*pelmVBoxMachine,
                                    settings::MachineConfigFile::BuildMachineXML_WriteVboxVersionAttribute
-                                 | settings::MachineConfigFile::BuildMachineXML_SkipRemovableMedia,
+                                 | settings::MachineConfigFile::BuildMachineXML_SkipRemovableMedia
+                                 | settings::MachineConfigFile::BuildMachineXML_SuppressSavedState,
                                         // but not BuildMachineXML_IncludeSnapshots nor BuildMachineXML_MediaRegistry
                                  pllElementsWithUuidAttributes);

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

@@ -4143 +4143 @@
  *      when this gets called for OVF export.
  *
+ * --   BuildMachineXML_SuppressSavedState: If set, the Machine/@stateFile
+ *      attribute is never set. This is also for the OVF export case because we
+ *      cannot save states with OVF.
+ *
  * @param elmMachine XML <Machine> element to add attributes and elements to.
  * @param fl Flags.
@@ -4163 +4167 @@
         elmMachine.createChild("Description")->addContent(machineUserData.strDescription);
     elmMachine.setAttribute("OSType", machineUserData.strOsType);
-    if (strStateFile.length())
+    if (    strStateFile.length()
+         && !(fl & BuildMachineXML_SuppressSavedState)
+       )
         elmMachine.setAttribute("stateFile", strStateFile);
     if (    (fl & BuildMachineXML_IncludeSnapshots)