Changeset 31469 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 9, 2010 9:33:57 AM (15 years ago)

Author:

vboxsync

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

64551

Message:

Main: settings: bumpSettingsVersionIfNeeded(): optimizations

File:

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

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

@@ -4230 +4230 @@
     }
 
-    // settings version 1.9 is required if there is not exactly one DVD
-    // or more than one floppy drive present or the DVD is not at the secondary
-    // master; this check is a bit more complicated
-    //
-    // settings version 1.10 is required if the host cache should be disabled
-    if (m->sv < SettingsVersion_v1_10)
-    {
-        size_t cDVDs = 0;
-        size_t cFloppies = 0;
-
-        // need to run thru all the storage controllers to figure this out
-        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
-             it != storageMachine.llStorageControllers.end();
-             ++it)
-        {
-            const StorageController &sctl = *it;
-            for (AttachedDevicesList::const_iterator it2 = sctl.llAttachedDevices.begin();
-                 it2 != sctl.llAttachedDevices.end();
-                 ++it2)
-            {
-                // we can only write the StorageController/@Instance attribute with v1.9
-                if (sctl.ulInstance != 0)
-                {
-                    if (m->sv < SettingsVersion_v1_9)
-                        m->sv = SettingsVersion_v1_9;
-                }
-
-                const AttachedDevice &att = *it2;
-                if (att.deviceType == DeviceType_DVD)
-                {
-                    if (    (sctl.storageBus != StorageBus_IDE) // DVD at bus other than DVD?
-                         || (att.lPort != 1)                    // DVDs not at secondary master?
-                         || (att.lDevice != 0)
-                       )
-                    {
-                        if (m->sv < SettingsVersion_v1_9)
-                            m->sv = SettingsVersion_v1_9;
-                    }
-
-                    ++cDVDs;
-                }
-                else if (att.deviceType == DeviceType_Floppy)
-                    ++cFloppies;
-
-                // Disabling the host IO cache requires settings version 1.10
-                if (!sctl.fUseHostIOCache)
-                {
-                    m->sv = SettingsVersion_v1_10;
-                    break; /* abort the loop -- we will not raise the version further */
-                }
-
-                /* Bandwidth limitations are new in VirtualBox 3.3 (1.11) */
-                if (att.ulBandwidthLimit != 0)
-                {
-                    m->sv = SettingsVersion_v1_11;
-                    break; /* abort the loop -- we will not raise the version further */
-                }
-            }
-        }
-
-        // 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)
-             && (    (cDVDs != 1)
-                  || (cFloppies > 1)
-                )
-           )
-            m->sv = SettingsVersion_v1_9;
-    }
-
     // all the following require settings version 1.9
     if (    (m->sv < SettingsVersion_v1_9)
@@ -4313 +4243 @@
         m->sv = SettingsVersion_v1_9;
 
+    // settings version 1.9 is required if there is not exactly one DVD
+    // or more than one floppy drive present or the DVD is not at the secondary
+    // master; this check is a bit more complicated
+    //
+    // settings version 1.10 is required if the host cache should be disabled
+    if (m->sv < SettingsVersion_v1_10)
+    {
+        size_t cDVDs = 0;
+        size_t cFloppies = 0;
+
+        // need to run thru all the storage controllers to figure this out
+        for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
+             it != storageMachine.llStorageControllers.end();
+             ++it)
+        {
+            const StorageController &sctl = *it;
+            for (AttachedDevicesList::const_iterator it2 = sctl.llAttachedDevices.begin();
+                 it2 != sctl.llAttachedDevices.end();
+                 ++it2)
+            {
+                // we can only write the StorageController/@Instance attribute with v1.9
+                if (sctl.ulInstance != 0)
+                {
+                    if (m->sv < SettingsVersion_v1_9)
+                        m->sv = SettingsVersion_v1_9;
+                }
+
+                const AttachedDevice &att = *it2;
+                if (att.deviceType == DeviceType_DVD)
+                {
+                    if (    (sctl.storageBus != StorageBus_IDE) // DVD at bus other than DVD?
+                         || (att.lPort != 1)                    // DVDs not at secondary master?
+                         || (att.lDevice != 0)
+                       )
+                    {
+                        if (m->sv < SettingsVersion_v1_9)
+                            m->sv = SettingsVersion_v1_9;
+                    }
+
+                    ++cDVDs;
+                }
+                else if (att.deviceType == DeviceType_Floppy)
+                    ++cFloppies;
+
+                // Disabling the host IO cache requires settings version 1.10
+                if (!sctl.fUseHostIOCache)
+                {
+                    m->sv = SettingsVersion_v1_10;
+                    break; /* abort the loop -- we will not raise the version further */
+                }
+
+                /* Bandwidth limitations are new in VirtualBox 3.3 (1.11) */
+                if (att.ulBandwidthLimit != 0)
+                {
+                    m->sv = SettingsVersion_v1_11;
+                    break; /* abort the loop -- we will not raise the version further */
+                }
+            }
+        }
+
+        // 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)
+             && (    (cDVDs != 1)
+                  || (cFloppies > 1)
+                )
+           )
+            m->sv = SettingsVersion_v1_9;
+    }
+
     // "accelerate 2d video" requires settings version 1.8
     if (    (m->sv < SettingsVersion_v1_8)