Changeset 24274 in vbox

Timestamp:

Nov 2, 2009 6:51:09 PM (15 years ago)

Author:

vboxsync

Message:

Main: xml versioning fixes

File:

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

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

@@ -1450 +1450 @@
     if (elmHardware.getAttributeValue("uuid", strUUID))
         parseUUID(hw.uuid, strUUID);
-    else
-        hw.uuid.clear();
 
     xml::NodesLoop nl1(elmHardware);
@@ -1863 +1861 @@
         }
 
-        if (!pelmController->getAttributeValue("Instance", sctl.ulInstance))
-            sctl.ulInstance = 0;
+        pelmController->getAttributeValue("Instance", sctl.ulInstance);
+            // default from constructor is 0
 
         Utf8Str strType;
@@ -2340 +2338 @@
     if (hw.strVersion != "2")
         pelmHardware->setAttribute("version", hw.strVersion);
-    if (!hw.uuid.isEmpty())
+    if (    (m->sv >= SettingsVersion_v1_9)
+         && (!hw.uuid.isEmpty())
+       )
         pelmHardware->setAttribute("uuid", makeString(hw.uuid));
 
@@ -2739 +2739 @@
         pelmController->setAttribute("PortCount", sc.ulPortCount);
 
-        pelmController->setAttribute("Instance", sc.ulInstance);
+        if (m->sv >= SettingsVersion_v1_9)
+            if (sc.ulInstance)
+                pelmController->setAttribute("Instance", sc.ulInstance);
 
         if (sc.controllerType == StorageControllerType_IntelAhci)
@@ -2755 +2757 @@
             const AttachedDevice &att = *it2;
 
-            /* DVD/Floppy is handled already for settings version before 1.8 */
+            // For settings version before 1.9, DVDs and floppies are in hardware, not storage controllers,
+            // so we shouldn't write them here; we only get here for DVDs though because we ruled out
+            // the floppy controller at the top of the loop
             if (    att.deviceType == DeviceType_DVD
-                &&  m->sv <= SettingsVersion_v1_8)
+                 && m->sv < SettingsVersion_v1_9
+               )
                 continue;
 
@@ -2863 +2868 @@
             const StorageController &sctl = *it;
             for (AttachedDevicesList::const_iterator it2 = sctl.llAttachedDevices.begin();
-                    it2 != sctl.llAttachedDevices.end()
-                        && m->sv < SettingsVersion_v1_9;
-                    ++it2)
-            {
+                 it2 != sctl.llAttachedDevices.end();
+                 ++it2)
+            {
+                if (sctl.ulInstance != 0)       // we can only write the StorageController/@Instance attribute with v1.9
+                {
+                    m->sv = SettingsVersion_v1_9;
+                    break;
+                }
+
                 const AttachedDevice &att = *it2;
                 if (att.deviceType == DeviceType_DVD)
@@ -2886 +2896 @@
         }
 
-        // VirtualBox before 3.1 had exactly one floppy and exactly one DVD,
+        // VirtualBox before 3.1 had zero or one floppy and exactly one DVD,
         // so any deviation from that will require settings version 1.9
         if (    (m->sv < SettingsVersion_v1_9)