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

Timestamp:

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

Author:

vboxsync

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

64550

Message:

Main: settings: bumpSettingsVersionIfNeeded(): optimizations

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (1 diff)

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

@@ -4210 +4210 @@
         }
     }
+
     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)
+        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 support for VRDP video channel
-        else if (hardwareMachine.vrdpSettings.fVideoChannel)
-            m->sv = SettingsVersion_v1_10;
-    }
-
-    // VirtualBox 3.2 adds support for page fusion
-    if (    m->sv < SettingsVersion_v1_10
-        &&  hardwareMachine.fPageFusionEnabled
-       )
-        m->sv = SettingsVersion_v1_10;
-
-    // VirtualBox 3.2 adds support for CPU hotplug, RTC timezone control, HID type and HPET
-    if (    m->sv < SettingsVersion_v1_10
-         && (    fRTCUseUTC
-              || hardwareMachine.fCpuHotPlug
-              || hardwareMachine.pointingHidType != PointingHidType_PS2Mouse
-              || hardwareMachine.keyboardHidType != KeyboardHidType_PS2Keyboard
-              || hardwareMachine.fHpetEnabled
-            )
-       )
-        m->sv = SettingsVersion_v1_10;
-
-    // settings version 1.9 is also required if there is not exactly one DVD
+    }
+
+    // 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