Changeset 23600 in vbox

Timestamp:

Oct 7, 2009 5:49:26 PM (15 years ago)

Author:

vboxsync

Message:

Main: three new Machine settings (not enabled).

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/include/VBox/settings.h

@@ -554 +554 @@
     com::Guid               uuidCurrentSnapshot;
     com::Utf8Str            strSnapshotFolder;
+    bool                    fLiveMigrationTarget;
+    uint32_t                uLiveMigrationPort;
+    com::Utf8Str            strLiveMigrationPassword;
 
     bool                    fCurrentStateModified;      // optional, default is true

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5032 +5032 @@
         mData->mLastStateChange = mData->m_pMachineConfigFile->timeLastStateChange;
 
-/** @todo LiveMigration: Load LiveMigration properties here. */
+        /* Live migration */
+        mUserData->mLiveMigrationTarget = mData->m_pMachineConfigFile->fLiveMigrationTarget;
+        mUserData->mLiveMigrationPort = mData->m_pMachineConfigFile->uLiveMigrationPort;
+        mUserData->mLiveMigrationPassword = mData->m_pMachineConfigFile->strLiveMigrationPassword;
+
         /*
          *  note: all mUserData members must be assigned prior this point because
@@ -6022 +6026 @@
         mData->m_pMachineConfigFile->timeLastStateChange = mData->mLastStateChange;
         mData->m_pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted);
-/** @todo LiveMigration: Save LiveMigration properties here. */
+
+        mData->m_pMachineConfigFile->fLiveMigrationTarget = !!mUserData->mLiveMigrationTarget;
+        mData->m_pMachineConfigFile->uLiveMigrationPort = mUserData->mLiveMigrationPort;
+        mData->m_pMachineConfigFile->strLiveMigrationPassword = mUserData->mLiveMigrationPassword;
 
         rc = saveHardware(mData->m_pMachineConfigFile->hardwareMachine);

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

@@ -2192 +2192 @@
             // constructor has called RTTimeNow(&timeLastStateChange) before
 
+        if (!elmMachine.getAttributeValue("liveMigrationTarget", fLiveMigrationTarget))
+            fLiveMigrationTarget = false;
+        if (!elmMachine.getAttributeValue("liveMigrationPort", uLiveMigrationPort))
+            uLiveMigrationPort = 0;
+        if (!elmMachine.getAttributeValue("liveMigrationPassword", strLiveMigrationPassword))
+            strLiveMigrationPassword = "";
+
         // parse Hardware before the other elements because other things depend on it
         const xml::ElementNode *pelmHardware;
@@ -2255 +2262 @@
     : ConfigFileBase(pstrFilename),
       fNameSync(true),
+      fLiveMigrationTarget(false),
+      uLiveMigrationPort(0),
       fCurrentStateModified(true),
       fAborted(false)
@@ -2887 +2896 @@
         if (fAborted)
             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);
+#endif
 
         writeExtraData(*pelmMachine, mapExtraDataItems);