Changeset 101154 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Sep 18, 2023 2:45:36 PM (17 months ago)

Author:

vboxsync

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

159127

Message:

Main: Fixed writing the firmware type in the machine settings (settings < v1.20 stored that also in the "Firmware" element instead of the "BIOS" element). bugref:10384

File:

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

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

@@ -7589 +7589 @@
         || !hw.nvramSettings.areDefaultSettings())
     {
-        xml::ElementNode *pelmFirmwareOrBIOS;
-        if (m->sv >= SettingsVersion_v1_20) /* Since settings v1.20 the element was renamed to "Firmware". */
-            pelmFirmwareOrBIOS = pelmHardware->createChild("Firmware");
-        else
-            pelmFirmwareOrBIOS = pelmHardware->createChild("BIOS");
+        /* Settings < v1.20 also had a "Firmware" element, but that only stored the firmware type. */
+        xml::ElementNode *pelmFirmware = pelmHardware->createChild("Firmware");
 
         if (   (m->sv >= SettingsVersion_v1_9)
@@ -7609 +7606 @@
                 default:                    pcszFirmware = "None";    break;
             }
-            pelmFirmwareOrBIOS->setAttribute("type", pcszFirmware);
-        }
+            pelmFirmware->setAttribute("type", pcszFirmware);
+        }
+
+        xml::ElementNode *pelmFirmwareOrBIOS;
+        if (m->sv >= SettingsVersion_v1_20) /* Since settings v1.20 the rest also gets stored in "Firmware". */
+            pelmFirmwareOrBIOS = pelmFirmware; /* Use the "Firmware" element from above. */
+        else /* For settings < v1.20 the rest was stored in the "BIOS" element. */
+            pelmFirmwareOrBIOS = pelmHardware->createChild("BIOS");
 
         if (!hw.firmwareSettings.fACPIEnabled)