Changeset 31472 in vbox for trunk

Timestamp:

Aug 9, 2010 9:48:11 AM (14 years ago)

Author:

vboxsync

Message:

Main: settings: bumpSettingsVersionIfNeeded(): optimization (move cheap 1.10 check before expensive one)

File:

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

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

@@ -4234 +4234 @@
     }
 
+    // VirtualBox 3.2: Check for non default I/O settings
+    if (m->sv < SettingsVersion_v1_10)
+    {
+        if (   (hardwareMachine.ioSettings.fIoCacheEnabled != true)
+            || (hardwareMachine.ioSettings.ulIoCacheSize != 5)
+                // and VRDP video channel
+            || (hardwareMachine.vrdpSettings.fVideoChannel)
+                // and page fusion
+            || (hardwareMachine.fPageFusionEnabled)
+                // and CPU hotplug, RTC timezone control, HID type and HPET
+            || fRTCUseUTC
+            || hardwareMachine.fCpuHotPlug
+            || hardwareMachine.pointingHidType != PointingHidType_PS2Mouse
+            || hardwareMachine.keyboardHidType != KeyboardHidType_PS2Keyboard
+            || hardwareMachine.fHpetEnabled
+           )
+            m->sv = SettingsVersion_v1_10;
+    }
+
     // VirtualBox 3.2 adds NAT and boot priority to the NIC config in Main
     if (m->sv < SettingsVersion_v1_10)
@@ -4285 +4304 @@
     }
 
-    if (m->sv < SettingsVersion_v1_10)
-    {
-        // VirtualBox 3.2: Check for non default I/O settings and bump the settings version.
-        if (   (hardwareMachine.ioSettings.fIoCacheEnabled != true)
-            || (hardwareMachine.ioSettings.ulIoCacheSize != 5)
-                // and VRDP video channel
-            || (hardwareMachine.vrdpSettings.fVideoChannel)
-                // and page fusion
-            || (hardwareMachine.fPageFusionEnabled)
-                // and CPU hotplug, RTC timezone control, HID type and HPET
-            || fRTCUseUTC
-            || hardwareMachine.fCpuHotPlug
-            || hardwareMachine.pointingHidType != PointingHidType_PS2Mouse
-            || hardwareMachine.keyboardHidType != KeyboardHidType_PS2Keyboard
-            || hardwareMachine.fHpetEnabled
-           )
-            m->sv = SettingsVersion_v1_10;
-    }
-
     // all the following require settings version 1.9
     if (    (m->sv < SettingsVersion_v1_9)