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

Timestamp:

Oct 15, 2009 12:10:55 PM (15 years ago)

Author:

vboxsync

Message:

Main/Settings: bump settings version to 1.9 if any of the live migration bits are set to non-default values.

File:

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

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

@@ -1209 +1209 @@
           fNestedPaging(false),
           fVPID(false),
+          fSyntheticCpu(false),
           fPAE(false),
-          fSyntheticCpu(false),
           cCPUs(1),
           ulMemorySizeMB((uint32_t)-1),
@@ -1474 +1474 @@
                 pelmCPUChild->getAttributeValue("enabled", hw.fPAE);
             if ((pelmCPUChild = pelmHwChild->findChildElement("SyntheticCpu")))
-                pelmCPUChild->getAttributeValue("enabled", hw.fSyntheticCpu);            
+                pelmCPUChild->getAttributeValue("enabled", hw.fSyntheticCpu);
         }
         else if (pelmHwChild->nameEquals("Memory"))
@@ -2872 +2872 @@
         m->sv = SettingsVersion_v1_9;
     }
+
+#ifdef VBOX_WITH_LIVE_MIGRATION
+    if (    m->sv < SettingsVersion_v1_9
+        &&  (   fLiveMigrationTarget
+             || uLiveMigrationPort
+             || !strLiveMigrationPassword.isEmpty()
+            )
+       )
+        m->sv = SettingsVersion_v1_9;
+#endif
 }
 
@@ -2912 +2922 @@
             pelmMachine->setAttribute("aborted", fAborted);
 #ifdef VBOX_WITH_LIVE_MIGRATION /** @todo LiveMigration: Checkout how the file format versioning is done. */
-        if (fLiveMigrationTarget)
-            pelmMachine->setAttribute("liveMigrationTarget", true);
-        if (uLiveMigrationPort)
-            pelmMachine->setAttribute("liveMigrationPort", uLiveMigrationPort);
-        if (!strLiveMigrationPassword.isEmpty())
-            pelmMachine->setAttribute("liveMigrationPassword", strLiveMigrationPassword);
+        if (m->sv >= SettingsVersion_v1_9)
+        {
+            if (fLiveMigrationTarget)
+                pelmMachine->setAttribute("liveMigrationTarget", true);
+            if (uLiveMigrationPort)
+                pelmMachine->setAttribute("liveMigrationPort", uLiveMigrationPort);
+            if (!strLiveMigrationPassword.isEmpty())
+                pelmMachine->setAttribute("liveMigrationPassword", strLiveMigrationPassword);
+        }
 #endif