Changeset 24497 in vbox for trunk/src/VBox

Timestamp:

Nov 9, 2009 12:31:12 PM (15 years ago)

Author:

vboxsync

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

54586

Message:

Main/Settings.cpp: Corrected the handling of the hardware version. Added a kludge for dealing with the output of the buggy code.

File:

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

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

@@ -1247 +1247 @@
  */
 Hardware::Hardware()
-        : strVersion("2"),
+        : strVersion("1"),
           fHardwareVirt(true),
           fHardwareVirtExclusive(HWVIRTEXCLUSIVEDEFAULT),
@@ -1520 +1520 @@
                                      Storage &strg)
 {
-    elmHardware.getAttributeValue("version", hw.strVersion);
-            // defaults to 2 and is only written if != 2
-
+    if (!elmHardware.getAttributeValue("version", hw.strVersion))
+    {
+        /* KLUDGE ALERT!  For a while during the 3.1 development this was not
+           written because it was thought to have a default value of "2".  For
+           sv <= 1.3 it defaults to "1" because the attribute didn't exist,
+           while for 1.4+ it is sort of mandatory.  Now, the buggy XML writer
+           code only wrote 1.7 and later.  So, if it's a 1.7+ XML file and it's
+           missing the hardware version, then it probably should be "2" instead
+           of "1". */
+        if (m->sv < SettingsVersion_v1_7)
+            hw.strVersion = "1";
+        else
+            hw.strVersion = "2";
+    }
     Utf8Str strUUID;
     if (elmHardware.getAttributeValue("uuid", strUUID))
@@ -2424 +2435 @@
     xml::ElementNode *pelmHardware = elmParent.createChild("Hardware");
 
-    if (hw.strVersion != "2")
+    if (m->sv >= SettingsVersion_v1_4)
         pelmHardware->setAttribute("version", hw.strVersion);
     if (    (m->sv >= SettingsVersion_v1_9)
@@ -2952 +2963 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    // The hardware versions other than "1" requires settings version 1.4 (2.1+).
+    if (    m->sv < SettingsVersion_v1_4
+         && hardwareMachine.strVersion != "1")
+        m->sv < SettingsVersion_v1_4;
+
     // "accelerate 2d video" requires settings version 1.8
     if (    (m->sv < SettingsVersion_v1_8)