Changeset 23803 in vbox for trunk/src/VBox/Main/xml/Settings.cpp

Timestamp:

Oct 15, 2009 3:37:20 PM (15 years ago)

Author:

vboxsync

Message:

Main/xml: Put the target teleporter settings in a separate node (Machine got too crowded with attributes). Enabled the code.

File:

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

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

@@ -2203 +2203 @@
             // constructor has called RTTimeNow(&timeLastStateChange) before
 
-        if (!elmMachine.getAttributeValue("teleporterEnabled", fTeleporterEnabled) /** @todo Teleportation: remove liveMigration* in a couple of days. */
+#if 1 /** @todo Teleportation: Obsolete. Remove in a couple of days. */
+        if (!elmMachine.getAttributeValue("teleporterEnabled", fTeleporterEnabled)
          && !elmMachine.getAttributeValue("liveMigrationTarget", fTeleporterEnabled))
             fTeleporterEnabled = false;
@@ -2214 +2215 @@
          && !elmMachine.getAttributeValue("liveMigrationPassword", strTeleporterPassword))
             strTeleporterPassword = "";
+#endif
 
         // parse Hardware before the other elements because other things depend on it
@@ -2245 +2247 @@
             else if (pelmMachineChild->nameEquals("Description"))
                 strDescription = pelmMachineChild->getValue();
+            else if (pelmMachineChild->nameEquals("Teleporter"))
+            {
+                if (!pelmMachineChild->getAttributeValue("enabled", fTeleporterEnabled))
+                    fTeleporterEnabled = false;
+                if (!pelmMachineChild->getAttributeValue("port", uTeleporterPort))
+                    uTeleporterPort = 0;
+                if (!pelmMachineChild->getAttributeValue("address", strTeleporterAddress))
+                    strTeleporterAddress = "";
+                if (!pelmMachineChild->getAttributeValue("password", strTeleporterPassword))
+                    strTeleporterPassword = "";
+            }
         }
 
@@ -2925 +2938 @@
         if (fAborted)
             pelmMachine->setAttribute("aborted", fAborted);
-#ifdef VBOX_WITH_LIVE_MIGRATION /** @todo Teleportation: Enable in a bit. */
-        if (m->sv >= SettingsVersion_v1_9)
-        {
-            if (fTeleporterEnabled)
-                pelmMachine->setAttribute("teleporterEnabled", true);
-            if (uTeleporterPort)
-                pelmMachine->setAttribute("teleporterPort", uTeleporterPort);
-            if (!strTeleporterAddress.isEmpty())
-                pelmMachine->setAttribute("teleporterAddress", strTeleporterAddress);
-            if (!strTeleporterPassword.isEmpty())
-                pelmMachine->setAttribute("teleporterPassword", strTeleporterPassword);
-        }
-#endif
+        if (    m->sv >= SettingsVersion_v1_9
+            &&  (   fTeleporterEnabled
+                 || uTeleporterPort
+                 || !strTeleporterAddress.isEmpty()
+                 || !strTeleporterPassword.isEmpty()
+                )
+           )
+        {
+           xml::ElementNode *pelmTeleporter = pelmMachine->createChild("Teleporter");
+           pelmTeleporter->setAttribute("enabled", fTeleporterEnabled);
+           pelmTeleporter->setAttribute("port", uTeleporterPort);
+           pelmTeleporter->setAttribute("address", strTeleporterAddress);
+           pelmTeleporter->setAttribute("password", strTeleporterPassword);
+        }
 
         writeExtraData(*pelmMachine, mapExtraDataItems);