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

Timestamp:

Sep 25, 2009 2:37:09 PM (15 years ago)

Author:

vboxsync

Message:

Main: be stricter with bumping settings version to 1.9 when incompatible floppy or DVD settings are detected

File:

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

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

@@ -2761 +2761 @@
 
 /**
- * Called from Main code to write a machine config file to disk. This builds a DOM tree from
- * the member variables and then writes the XML file; it throws xml::Error instances on errors,
- * in particular if the file cannot be written.
- */
-void MachineConfigFile::write(const com::Utf8Str &strFilename)
-{
-    // createStubDocument() sets the settings version to at least 1.7; however,
-    // we might need to enfore a later settings version if incompatible settings
-    // are present:
+ * Called from write() before calling ConfigFileBase::createStubDocument().
+ * This adjusts the settings version in m->sv if incompatible settings require
+ * a settings bump, whereas otherwise we try to preserve the settings version
+ * to avoid breaking compatibility with older versions.
+ */
+void MachineConfigFile::bumpSettingsVersionIfNeeded()
+{
     if (m->sv < SettingsVersion_v1_8)
     {
@@ -2798 +2796 @@
                 if (att.deviceType == DeviceType_DVD)
                 {
-                    if (    (cDVDs)                             // more than one DVD?
-                         || (sctl.storageBus != StorageBus_IDE) // DVD at bus other than DVD?
-                         || (att.lPort != 1)                    // DVDs not at primary master?
+                    if (    (sctl.storageBus != StorageBus_IDE) // DVD at bus other than DVD?
+                         || (att.lPort != 1)                    // DVDs not at secondary master?
                          || (att.lDevice != 0)
                        )
@@ -2811 +2808 @@
                 }
                 else if (att.deviceType == DeviceType_Floppy)
-                {
-                    if (cFloppies)
-                        // more than one floppy: new settings format
-                        m->sv = SettingsVersion_v1_9;
-
                     ++cFloppies;
-                }
-            }
-        }
+            }
+        }
+
+        // VirtualBox before 3.1 had exactly one floppy and exactly one DVD,
+        // so any deviation from that will require settings version 1.9
+        if (    (m->sv < SettingsVersion_v1_9)
+             && (    (cDVDs != 1)
+                  || (cFloppies > 1)
+                )
+           )
+            m->sv = SettingsVersion_v1_9;
     }
 
@@ -2828 +2828 @@
         m->sv = SettingsVersion_v1_9;
     }
-
+}
+
+/**
+ * Called from Main code to write a machine config file to disk. This builds a DOM tree from
+ * the member variables and then writes the XML file; it throws xml::Error instances on errors,
+ * in particular if the file cannot be written.
+ */
+void MachineConfigFile::write(const com::Utf8Str &strFilename)
+{
     try
     {
+        // createStubDocument() sets the settings version to at least 1.7; however,
+        // we might need to enfore a later settings version if incompatible settings
+        // are present:
+        bumpSettingsVersionIfNeeded();
+
         m->strFilename = strFilename;
         createStubDocument();