Changeset 30286 in vbox

Timestamp:

Jun 17, 2010 2:55:21 PM (14 years ago)

Author:

vboxsync

Message:

Main/Settings: fixed determination if we require settings V1_9 or V1_10 depending if the host cache should be disabled or not

File:

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

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

@@ -3941 +3941 @@
     // or more than one floppy drive present or the DVD is not at the secondary
     // master; this check is a bit more complicated
-    if (m->sv < SettingsVersion_v1_9)
+    //
+    // settings version 1.10 is required if the host cache should be disabled
+    if (m->sv < SettingsVersion_v1_10)
     {
         size_t cDVDs = 0;
@@ -3948 +3950 @@
         // need to run thru all the storage controllers to figure this out
         for (StorageControllersList::const_iterator it = storageMachine.llStorageControllers.begin();
-             it != storageMachine.llStorageControllers.end()
-                && m->sv < SettingsVersion_v1_9;
+             it != storageMachine.llStorageControllers.end();
              ++it)
         {
@@ -3957 +3958 @@
                  ++it2)
             {
-                if (sctl.ulInstance != 0)       // we can only write the StorageController/@Instance attribute with v1.9
+                // we can only write the StorageController/@Instance attribute with v1.9
+                if (sctl.ulInstance != 0)      
                 {
-                    m->sv = SettingsVersion_v1_9;
-                    break;
+                    if (m->sv < SettingsVersion_v1_9)
+                        m->sv = SettingsVersion_v1_9;
                 }
 
@@ -3971 +3973 @@
                        )
                     {
-                        m->sv = SettingsVersion_v1_9;
-                        break;
+                        if (m->sv < SettingsVersion_v1_9)
+                            m->sv = SettingsVersion_v1_9;
                     }
 
@@ -3984 +3986 @@
                 {
                     m->sv = SettingsVersion_v1_10;
-                    break;
+                    break; /* abort the loop -- we will not raise the version further */
                 }
             }