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

Timestamp:

Oct 15, 2009 3:00:47 PM (16 years ago)

Author:

vboxsync

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

53543

Message:

Main,VMM,Frontends,++: Teminology. Added a bind address for the (target) teleporter.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (16 diffs)
• ConsoleImplTeleporter.cpp (moved) (moved from trunk/src/VBox/Main/ConsoleImpl-LiveMigration.cpp ) (66 diffs)
• Global.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (19 diffs)
• Makefile.kmk (modified) (2 diffs)
• cbinding/tstXPCOMCCall.c (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (9 diffs)
• include/ConsoleImpl.h (modified) (4 diffs)
• include/MachineImpl.h (modified) (3 diffs)
• xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -228 +228 @@
           mConfigConstructor(NULL),
           mStartPaused(false),
-          mLiveMigrationTarget(FALSE)
+          mTeleporterEnabled(FALSE)
     {}
 
@@ -236 +236 @@
     Console::SharedFolderDataMap mSharedFolders;
     bool mStartPaused;
-    BOOL mLiveMigrationTarget;
+    BOOL mTeleporterEnabled;
 
     typedef std::list< ComPtr<IMedium> > HardDiskList;
@@ -4614 +4614 @@
     }
 
-    /* test and clear the LiveMigrationTarget property  */
-    BOOL fLiveMigrationTarget;
-    rc = mMachine->COMGETTER(LiveMigrationTarget)(&fLiveMigrationTarget);
+    /* test and clear the TeleporterEnabled property  */
+    BOOL fTeleporterEnabled;
+    rc = mMachine->COMGETTER(TeleporterEnabled)(&fTeleporterEnabled);
     CheckComRCReturnRC(rc);
-    if (fLiveMigrationTarget)
-    {
-        rc = mMachine->COMSETTER(LiveMigrationTarget)(FALSE);
+    if (fTeleporterEnabled)
+    {
+        rc = mMachine->COMSETTER(TeleporterEnabled)(FALSE);
         CheckComRCReturnRC(rc);
     }
@@ -4630 +4630 @@
     if (mMachineState == MachineState_Saved)
         progressDesc = tr("Restoring virtual machine");
-    else if (fLiveMigrationTarget)
-        progressDesc = tr("Migrating virtual machine");
+    else if (fTeleporterEnabled)
+        progressDesc = tr("Teleporting virtual machine");
     else
         progressDesc = tr("Starting virtual machine");
@@ -4650 +4650 @@
     if (mMachineState == MachineState_Saved)
         task->mSavedStateFile = savedStateFile;
-    task->mLiveMigrationTarget = fLiveMigrationTarget;
+    task->mTeleporterEnabled = fTeleporterEnabled;
 
     /* Reset differencing hard disks for which autoReset is true */
@@ -4732 +4732 @@
     if (mMachineState == MachineState_Saved)
         setMachineState(MachineState_Restoring);
-    else if (fLiveMigrationTarget)
-        setMachineState(MachineState_MigratingFrom);
+    else if (fTeleporterEnabled)
+        setMachineState(MachineState_TeleportingFrom);
     else
         setMachineState(MachineState_Starting);
@@ -4799 +4799 @@
               mMachineState == MachineState_Starting ||
               mMachineState == MachineState_Restoring ||
-              mMachineState == MachineState_MigratingFrom || /** @todo LiveMigration ???*/
+              mMachineState == MachineState_TeleportingFrom || /** @todo Teleportation ???*/
               mMachineState == MachineState_Stopping,
               ("Invalid machine state: %s\n", Global::stringifyMachineState(mMachineState)));
@@ -4814 +4814 @@
         && (   mMachineState == MachineState_Starting
             || mMachineState == MachineState_Restoring
-            || mMachineState == MachineState_MigratingFrom)
+            || mMachineState == MachineState_TeleportingFrom)
        )
         mVMPoweredOff = true;
@@ -4825 +4825 @@
     if (   mMachineState != MachineState_Saving
         && mMachineState != MachineState_Restoring
-        && mMachineState != MachineState_MigratingFrom
+        && mMachineState != MachineState_TeleportingFrom
         && mMachineState != MachineState_Stopping
        )
@@ -5511 +5511 @@
                 && that->mMachineState != MachineState_Saving
                 && that->mMachineState != MachineState_Restoring
-                && that->mMachineState != MachineState_MigratingFrom
+                && that->mMachineState != MachineState_TeleportingFrom
                )
             {
@@ -5606 +5606 @@
                     that->setMachineState(MachineState_Saved);
                     break;
-                case MachineState_MigratingFrom:
-                    /* Migration failed or was cancelled.  Back to powered off. */
+                case MachineState_TeleportingFrom:
+                    /* Teleportation failed or was cancelled.  Back to powered off. */
                     that->setMachineState(MachineState_PoweredOff);
                     break;
@@ -5617 +5617 @@
         {
             /** @todo state/live VMSTATE_SUSPENDING_LS. */
-            if ( aOldState == VMSTATE_SUSPENDING)
+            if (aOldState == VMSTATE_SUSPENDING)
             {
                 AutoWriteLock alock(that);
@@ -5647 +5647 @@
                            && aOldState == VMSTATE_POWERING_ON)
                        || (   (   that->mMachineState == MachineState_Restoring
-                               || that->mMachineState == MachineState_MigratingFrom
+                               || that->mMachineState == MachineState_TeleportingFrom
                                || that->mMachineState == MachineState_Paused)
                            && aOldState == VMSTATE_RESUMING));
@@ -6212 +6212 @@
 /**
  * Process callback handler for VMR3LoadFromFile, VMR3LoadFromStream, VMR3Save
- * and VMR3Migrate.
+ * and VMR3Teleport.
  *
  * @param   pVM         The VM handle.
@@ -6760 +6760 @@
                     }
                 }
-                else if (task->mLiveMigrationTarget)
+                else if (task->mTeleporterEnabled)
                 {
-                    /* -> ConsoleImpl-LiveMigration.cpp */
-                    vrc = console->migrationDst(pVM, pMachine, task->mStartPaused,
-                                                static_cast<VMProgressTask*>(task.get()));
+                    /* -> ConsoleImplTeleporter.cpp */
+                    vrc = console->teleporterTrg(pVM, pMachine, task->mStartPaused,
+                                                 static_cast<VMProgressTask*>(task.get()));
                     if (RT_FAILURE(vrc))
                         VMR3PowerOff(pVM);
@@ -6843 +6843 @@
     if (   console->mMachineState == MachineState_Starting
         || console->mMachineState == MachineState_Restoring
-        || console->mMachineState == MachineState_MigratingFrom
+        || console->mMachineState == MachineState_TeleportingFrom
        )
     {

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Console COM Class implementation, The Live Migration Part.
+ * VBox Console COM Class implementation, The Teleporter Part.
  */
 
@@ -45 +45 @@
 *******************************************************************************/
 /**
- * Base class for the migration state.
+ * Base class for the teleporter state.
  *
  * These classes are used as advanced structs, not as proper classes.
  */
-class MigrationState
+class TeleporterState
 {
 public:
@@ -67 +67 @@
     /** @} */
 
-    MigrationState(Console *pConsole, PVM pVM, bool fIsSource)
+    TeleporterState(Console *pConsole, PVM pVM, bool fIsSource)
         : mptrConsole(pConsole)
         , mpVM(pVM)
@@ -83 +83 @@
 
 /**
- * Migration state used by the source side.
- */
-class MigrationStateSrc : public MigrationState
+ * Teleporter state used by the source side.
+ */
+class TeleporterStateSrc : public TeleporterState
 {
 public:
@@ -92 +92 @@
     uint32_t            muPort;
 
-    MigrationStateSrc(Console *pConsole, PVM pVM)
-        : MigrationState(pConsole, pVM, true /*fIsSource*/)
+    TeleporterStateSrc(Console *pConsole, PVM pVM)
+        : TeleporterState(pConsole, pVM, true /*fIsSource*/)
         , muPort(UINT32_MAX)
     {
@@ -101 +101 @@
 
 /**
- * Migration state used by the destiation side.
- */
-class MigrationStateDst : public MigrationState
+ * Teleporter state used by the destiation side.
+ */
+class TeleporterStateTrg : public TeleporterState
 {
 public:
@@ -112 +112 @@
     int                 mRc;
 
-    MigrationStateDst(Console *pConsole, PVM pVM, IMachine *pMachine, PRTTIMERLR phTimerLR)
-        : MigrationState(pConsole, pVM, false /*fIsSource*/)
+    TeleporterStateTrg(Console *pConsole, PVM pVM, IMachine *pMachine, PRTTIMERLR phTimerLR)
+        : TeleporterState(pConsole, pVM, false /*fIsSource*/)
         , mpMachine(pMachine)
         , mpvVMCallbackTask(NULL)
@@ -130 +130 @@
  * stream ends.
  */
-typedef struct MIGRATIONTCPHDR
+typedef struct TELEPORTERTCPHDR
 {
     /** Magic value. */
@@ -137 +137 @@
      * 0 indicates the end of the stream. */
     uint32_t    cb;
-} MIGRATIONTCPHDR;
-/** Magic value for MIGRATIONTCPHDR::u32Magic. (Egberto Gismonti Amin) */
-#define MIGRATIONTCPHDR_MAGIC       UINT32_C(0x19471205)
+} TELEPORTERTCPHDR;
+/** Magic value for TELEPORTERTCPHDR::u32Magic. (Egberto Gismonti Amin) */
+#define TELEPORTERTCPHDR_MAGIC       UINT32_C(0x19471205)
 /** The max block size. */
-#define MIGRATIONTCPHDR_MAX_SIZE    UINT32_C(0x00fffff8)
+#define TELEPORTERTCPHDR_MAX_SIZE    UINT32_C(0x00fffff8)
 
 
@@ -147 +147 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-static const char g_szWelcome[] = "VirtualBox-LiveMigration-1.0\n";
+static const char g_szWelcome[] = "VirtualBox-Teleporter-1.0\n";
 
 
@@ -155 +155 @@
  * @returns VBox status code.
  *
- * @param   pState      The live migration state structure.
+ * @param   pState      The teleporter state structure.
  * @param   pszBuf      The output buffer.
  * @param   cchBuf      The size of the output buffer.
  *
  */
-static int migrationTcpReadLine(MigrationState *pState, char *pszBuf, size_t cchBuf)
+static int teleporterTcpReadLine(TeleporterState *pState, char *pszBuf, size_t cchBuf)
 {
     char       *pszStart = pszBuf;
@@ -175 +175 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("Migration: RTTcpRead -> %Rrc while reading string ('%s')\n", rc, pszStart));
+            LogRel(("Teleporter: RTTcpRead -> %Rrc while reading string ('%s')\n", rc, pszStart));
             return rc;
         }
@@ -183 +183 @@
         if (cchBuf <= 1)
         {
-            LogRel(("Migration: String buffer overflow: '%s'\n", pszStart));
+            LogRel(("Teleporter: String buffer overflow: '%s'\n", pszStart));
             return VERR_BUFFER_OVERFLOW;
         }
@@ -197 +197 @@
  *
  * @returns S_OK on ACK, E_FAIL+setError() on failure or NACK.
- * @param   pState              The live migration source state.
+ * @param   pState              The teleporter source state.
  * @param   pszWhich            Which ACK is this this?
  * @param   pszNAckMsg          Optional NACK message.
@@ -204 +204 @@
  */
 HRESULT
-Console::migrationSrcReadACK(MigrationStateSrc *pState, const char *pszWhich,
+Console::teleporterSrcReadACK(TeleporterStateSrc *pState, const char *pszWhich,
                              const char *pszNAckMsg /*= NULL*/)
 {
     char szMsg[128];
-    int vrc = migrationTcpReadLine(pState, szMsg, sizeof(szMsg));
+    int vrc = teleporterTcpReadLine(pState, szMsg, sizeof(szMsg));
     if (RT_FAILURE(vrc))
         return setError(E_FAIL, tr("Failed reading ACK(%s): %Rrc"), pszWhich, vrc);
@@ -221 +221 @@
                 if (pszNAckMsg)
                 {
-                    LogRel(("Migration: %s: NACK=%Rrc (%d)\n", pszWhich, vrc2, vrc2));
+                    LogRel(("Teleporter: %s: NACK=%Rrc (%d)\n", pszWhich, vrc2, vrc2));
                     return setError(E_FAIL, pszNAckMsg);
                 }
@@ -238 +238 @@
  * @returns S_OK on ACKed command, E_FAIL+setError() on failure.
  *
- * @param   pState              The live migration source state.
+ * @param   pState              The teleporter source state.
  * @param   pszCommand          The command.
  *
@@ -244 +244 @@
  */
 HRESULT
-Console::migrationSrcSubmitCommand(MigrationStateSrc *pState, const char *pszCommand)
+Console::teleporterSrcSubmitCommand(TeleporterStateSrc *pState, const char *pszCommand)
 {
     size_t cchCommand = strlen(pszCommand);
@@ -254 +254 @@
     if (RT_FAILURE(vrc))
         return setError(E_FAIL, tr("Failed writing command '%s': %Rrc"), pszCommand, vrc);
-    return migrationSrcReadACK(pState, pszCommand);
+    return teleporterSrcReadACK(pState, pszCommand);
 }
 
@@ -261 +261 @@
  * @copydoc SSMSTRMOPS::pfnWrite
  */
-static DECLCALLBACK(int) migrationTcpOpWrite(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite)
-{
-    MigrationState *pState = (MigrationState *)pvUser;
+static DECLCALLBACK(int) teleporterTcpOpWrite(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite)
+{
+    TeleporterState *pState = (TeleporterState *)pvUser;
 
     AssertReturn(cbToWrite > 0, VINF_SUCCESS);
@@ -271 +271 @@
     {
         /* Write block header. */
-        MIGRATIONTCPHDR Hdr;
-        Hdr.u32Magic = MIGRATIONTCPHDR_MAGIC;
-        Hdr.cb       = RT_MIN(cbToWrite, MIGRATIONTCPHDR_MAX_SIZE);
+        TELEPORTERTCPHDR Hdr;
+        Hdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
+        Hdr.cb       = RT_MIN(cbToWrite, TELEPORTERTCPHDR_MAX_SIZE);
         int rc = RTTcpWrite(pState->mhSocket, &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
         {
-            LogRel(("Migration/TCP: Header write error: %Rrc\n", rc));
+            LogRel(("Teleporter/TCP: Header write error: %Rrc\n", rc));
             return rc;
         }
@@ -285 +285 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("Migration/TCP: Data write error: %Rrc (cb=%#x)\n", rc, Hdr.cb));
+            LogRel(("Teleporter/TCP: Data write error: %Rrc (cb=%#x)\n", rc, Hdr.cb));
             return rc;
         }
@@ -308 +308 @@
  * @returns VBox status code.
  *
- * @param   pState          The migration state data.
- */
-static int migrationTcpReadSelect(MigrationState *pState)
+ * @param   pState          The teleporter state data.
+ */
+static int teleporterTcpReadSelect(TeleporterState *pState)
 {
     int rc;
@@ -319 +319 @@
         {
             pState->mfIOError = true;
-            LogRel(("Migration/TCP: Header select error: %Rrc\n", rc));
+            LogRel(("Teleporter/TCP: Header select error: %Rrc\n", rc));
             break;
         }
@@ -335 +335 @@
  * @copydoc SSMSTRMOPS::pfnRead
  */
-static DECLCALLBACK(int) migrationTcpOpRead(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead)
-{
-    MigrationState *pState = (MigrationState *)pvUser;
+static DECLCALLBACK(int) teleporterTcpOpRead(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead)
+{
+    TeleporterState *pState = (TeleporterState *)pvUser;
     AssertReturn(!pState->mfIsSource, VERR_INVALID_HANDLE);
 
@@ -360 +360 @@
         if (!pState->mcbReadBlock)
         {
-            rc = migrationTcpReadSelect(pState);
+            rc = teleporterTcpReadSelect(pState);
             if (RT_FAILURE(rc))
                 return rc;
-            MIGRATIONTCPHDR Hdr;
+            TELEPORTERTCPHDR Hdr;
             rc = RTTcpRead(pState->mhSocket, &Hdr, sizeof(Hdr), NULL);
             if (RT_FAILURE(rc))
             {
                 pState->mfIOError = true;
-                LogRel(("Migration/TCP: Header read error: %Rrc\n", rc));
+                LogRel(("Teleporter/TCP: Header read error: %Rrc\n", rc));
                 return rc;
             }
-            if (   Hdr.u32Magic != MIGRATIONTCPHDR_MAGIC
-                || Hdr.cb > MIGRATIONTCPHDR_MAX_SIZE)
+            if (   Hdr.u32Magic != TELEPORTERTCPHDR_MAGIC
+                || Hdr.cb > TELEPORTERTCPHDR_MAX_SIZE)
             {
                 pState->mfIOError = true;
-                LogRel(("Migration/TCP: Invalid block: u32Magic=%#x cb=%#x\n", Hdr.u32Magic, Hdr.cb));
+                LogRel(("Teleporter/TCP: Invalid block: u32Magic=%#x cb=%#x\n", Hdr.u32Magic, Hdr.cb));
                 return VERR_IO_GEN_FAILURE;
             }
@@ -393 +393 @@
          * Read more data.
          */
-        rc = migrationTcpReadSelect(pState);
+        rc = teleporterTcpReadSelect(pState);
         if (RT_FAILURE(rc))
             return rc;
@@ -401 +401 @@
         {
             pState->mfIOError = true;
-            LogRel(("Migration/TCP: Data read error: %Rrc (cb=%#x)\n", rc, cb));
+            LogRel(("Teleporter/TCP: Data read error: %Rrc (cb=%#x)\n", rc, cb));
             return rc;
         }
@@ -425 +425 @@
  * @copydoc SSMSTRMOPS::pfnSeek
  */
-static DECLCALLBACK(int) migrationTcpOpSeek(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
+static DECLCALLBACK(int) teleporterTcpOpSeek(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
 {
     return VERR_NOT_SUPPORTED;
@@ -434 +434 @@
  * @copydoc SSMSTRMOPS::pfnTell
  */
-static DECLCALLBACK(uint64_t) migrationTcpOpTell(void *pvUser)
-{
-    MigrationState *pState = (MigrationState *)pvUser;
+static DECLCALLBACK(uint64_t) teleporterTcpOpTell(void *pvUser)
+{
+    TeleporterState *pState = (TeleporterState *)pvUser;
     return pState->moffStream;
 }
@@ -444 +444 @@
  * @copydoc SSMSTRMOPS::pfnSize
  */
-static DECLCALLBACK(int) migrationTcpOpSize(void *pvUser, uint64_t *pcb)
+static DECLCALLBACK(int) teleporterTcpOpSize(void *pvUser, uint64_t *pcb)
 {
     return VERR_NOT_SUPPORTED;
@@ -453 +453 @@
  * @copydoc SSMSTRMOPS::pfnClose
  */
-static DECLCALLBACK(int) migrationTcpOpClose(void *pvUser)
-{
-    MigrationState *pState = (MigrationState *)pvUser;
+static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser)
+{
+    TeleporterState *pState = (TeleporterState *)pvUser;
 
     if (pState->mfIsSource)
     {
-        MIGRATIONTCPHDR EofHdr = { MIGRATIONTCPHDR_MAGIC, 0 };
+        TELEPORTERTCPHDR EofHdr = { TELEPORTERTCPHDR_MAGIC, 0 };
         int rc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr));
         if (RT_SUCCESS(rc))
@@ -465 +465 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("Migration/TCP: EOF Header write error: %Rrc\n", rc));
+            LogRel(("Teleporter/TCP: EOF Header write error: %Rrc\n", rc));
             return rc;
         }
@@ -482 +482 @@
  * Method table for a TCP based stream.
  */
-static SSMSTRMOPS const g_migrationTcpOps =
+static SSMSTRMOPS const g_teleporterTcpOps =
 {
     SSMSTRMOPS_VERSION,
-    migrationTcpOpWrite,
-    migrationTcpOpRead,
-    migrationTcpOpSeek,
-    migrationTcpOpTell,
-    migrationTcpOpSize,
-    migrationTcpOpClose,
+    teleporterTcpOpWrite,
+    teleporterTcpOpRead,
+    teleporterTcpOpSeek,
+    teleporterTcpOpTell,
+    teleporterTcpOpSize,
+    teleporterTcpOpClose,
     SSMSTRMOPS_VERSION
 };
@@ -498 +498 @@
  * @copydoc FNRTTIMERLR
  */
-static DECLCALLBACK(void) migrationTimeout(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick)
+static DECLCALLBACK(void) teleporterTimeout(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick)
 {
     /* This is harmless for any open connections. */
@@ -506 +506 @@
 
 /**
- * Do the live migration.
+ * Do the teleporter.
  *
  * @returns VBox status code.
- * @param   pState              The migration state.
+ * @param   pState              The teleporter state.
  */
 HRESULT
-Console::migrationSrc(MigrationStateSrc *pState)
+Console::teleporterSrc(TeleporterStateSrc *pState)
 {
     AutoCaller autoCaller(this);
@@ -518 +518 @@
 
     /*
-     * Wait for Console::Migrate to change the state.
+     * Wait for Console::Teleport to change the state.
      */
     { AutoWriteLock autoLock(); }
@@ -554 +554 @@
 
     /* ACK */
-    hrc = migrationSrcReadACK(pState, "password", tr("Invalid password"));
+    hrc = teleporterSrcReadACK(pState, "password", tr("Invalid password"));
     if (FAILED(hrc))
         return hrc;
@@ -566 +566 @@
      * Start loading the state.
      */
-    hrc = migrationSrcSubmitCommand(pState, "load");
+    hrc = teleporterSrcSubmitCommand(pState, "load");
     if (FAILED(hrc))
         return hrc;
 
-    void *pvUser = static_cast<void *>(static_cast<MigrationState *>(pState));
-    vrc = VMR3Migrate(pState->mpVM, &g_migrationTcpOps, pvUser, NULL/** @todo progress*/, pvUser);
+    void *pvUser = static_cast<void *>(static_cast<TeleporterState *>(pState));
+    vrc = VMR3Teleport(pState->mpVM, &g_teleporterTcpOps, pvUser, NULL/** @todo progress*/, pvUser);
     if (vrc)
-        return setError(E_FAIL, tr("VMR3Migrate -> %Rrc"), vrc);
-
-    hrc = migrationSrcReadACK(pState, "load-complete");
+        return setError(E_FAIL, tr("VMR3Teleport -> %Rrc"), vrc);
+
+    hrc = teleporterSrcReadACK(pState, "load-complete");
     if (FAILED(hrc))
         return hrc;
@@ -582 +582 @@
      * State fun? Automatic power off?
      */
-    hrc = migrationSrcSubmitCommand(pState, "done");
+    hrc = teleporterSrcSubmitCommand(pState, "done");
     if (FAILED(hrc))
         return hrc;
@@ -595 +595 @@
  * @returns VINF_SUCCESS (ignored).
  * @param   hThread             The thread.
- * @param   pvUser              Pointer to a MigrationStateSrc instance.
+ * @param   pvUser              Pointer to a TeleporterStateSrc instance.
  */
 /*static*/ DECLCALLBACK(int)
-Console::migrationSrcThreadWrapper(RTTHREAD hThread, void *pvUser)
-{
-    MigrationStateSrc *pState = (MigrationStateSrc *)pvUser;
+Console::teleporterSrcThreadWrapper(RTTHREAD hThread, void *pvUser)
+{
+    TeleporterStateSrc *pState = (TeleporterStateSrc *)pvUser;
 
     AutoVMCaller autoVMCaller(pState->mptrConsole);
@@ -606 +606 @@
 
     if (SUCCEEDED(hrc))
-        hrc = pState->mptrConsole->migrationSrc(pState);
+        hrc = pState->mptrConsole->teleporterSrc(pState);
 
     pState->mptrProgress->notifyComplete(hrc);
@@ -665 +665 @@
 
 /**
- * Start live migration to the specified target.
+ * Start teleporter to the specified target.
  *
  * @returns COM status code.
@@ -675 +675 @@
  */
 STDMETHODIMP
-Console::Migrate(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress)
+Console::Teleport(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress)
 {
     /*
@@ -709 +709 @@
      * Note! The thread won't start working until we release the lock.
      */
-    LogFlowThisFunc(("Initiating LIVE MIGRATION request...\n"));
-
-    ComObjPtr<Progress> ptrMigrateProgress;
-    HRESULT hrc = ptrMigrateProgress.createObject();
+    LogFlowThisFunc(("Initiating TELEPORTER request...\n"));
+
+    ComObjPtr<Progress> ptrTelportationProgress;
+    HRESULT hrc = ptrTelportationProgress.createObject();
     CheckComRCReturnRC(hrc);
-    hrc = ptrMigrateProgress->init(static_cast<IConsole *>(this),
-                                   Bstr(tr("Live Migration")),
-                                   TRUE /*aCancelable*/);
+    hrc = ptrTelportationProgress->init(static_cast<IConsole *>(this),
+                                        Bstr(tr("Teleporter")),
+                                        TRUE /*aCancelable*/);
     CheckComRCReturnRC(hrc);
 
-    MigrationStateSrc *pState = new MigrationStateSrc(this, mpVM);
+    TeleporterStateSrc *pState = new TeleporterStateSrc(this, mpVM);
     pState->mstrPassword = aPassword;
     pState->mstrHostname = aHostname;
     pState->muPort       = aPort;
-    pState->mptrProgress = ptrMigrateProgress;
-
-    int vrc = RTThreadCreate(NULL, Console::migrationSrcThreadWrapper, (void *)pState, 0 /*cbStack*/,
-                             RTTHREADTYPE_EMULATION, 0 /*fFlags*/, "Migrate");
+    pState->mptrProgress = ptrTelportationProgress;
+
+    int vrc = RTThreadCreate(NULL, Console::teleporterSrcThreadWrapper, (void *)pState, 0 /*cbStack*/,
+                             RTTHREADTYPE_EMULATION, 0 /*fFlags*/, "Teleport");
     if (RT_SUCCESS(vrc))
     {
         hrc = setMachineState(MachineState_Saving);
         if (SUCCEEDED(hrc))
-            ptrMigrateProgress.queryInterfaceTo(aProgress);
+            ptrTelportationProgress.queryInterfaceTo(aProgress);
         else
-            ptrMigrateProgress->Cancel();
+            ptrTelportationProgress->Cancel();
     }
     else
@@ -747 +747 @@
 /**
  * Creates a TCP server that listens for the source machine and passes control
- * over to Console::migrationDstServeConnection().
+ * over to Console::teleporterTrgServeConnection().
  *
  * @returns VBox status code.
@@ -758 +758 @@
  */
 int
-Console::migrationDst(PVM pVM, IMachine *pMachine, bool fStartPaused, void *pvVMCallbackTask)
+Console::teleporterTrg(PVM pVM, IMachine *pMachine, bool fStartPaused, void *pvVMCallbackTask)
 {
     /*
@@ -764 +764 @@
      */
     ULONG uPort;
-    HRESULT hrc = pMachine->COMGETTER(LiveMigrationPort)(&uPort);
+    HRESULT hrc = pMachine->COMGETTER(TeleporterPort)(&uPort);
     if (FAILED(hrc))
         return VERR_GENERAL_FAILURE;
 
+    Bstr bstrAddress;
+    hrc = pMachine->COMGETTER(TeleporterAddress)(bstrAddress.asOutParam());
+    if (FAILED(hrc))
+        return VERR_GENERAL_FAILURE;
+    Utf8Str strAddress(bstrAddress);
+    const char *pszAddress = strAddress.isEmpty() ? NULL : strAddress.c_str();
+
     Bstr bstrPassword;
-    hrc = pMachine->COMGETTER(LiveMigrationPassword)(bstrPassword.asOutParam());
+    hrc = pMachine->COMGETTER(TeleporterPassword)(bstrPassword.asOutParam());
     if (FAILED(hrc))
         return VERR_GENERAL_FAILURE;
@@ -775 +782 @@
     strPassword.append('\n');           /* To simplify password checking. */
 
-    Utf8Str strBind("");
-    /** @todo Add a bind address property. */
-    const char *pszBindAddress = strBind.isEmpty() ? NULL : strBind.c_str();
-
-
     /*
      * Create the TCP server.
@@ -786 +788 @@
     PRTTCPSERVER hServer;
     if (uPort)
-        vrc = RTTcpServerCreateEx(pszBindAddress, uPort, &hServer);
+        vrc = RTTcpServerCreateEx(pszAddress, uPort, &hServer);
     else
     {
@@ -792 +794 @@
         {
             uPort = RTRandU32Ex(cTries >= 8192 ? 49152 : 1024, 65534);
-            vrc = RTTcpServerCreateEx(pszBindAddress, uPort, &hServer);
+            vrc = RTTcpServerCreateEx(pszAddress, uPort, &hServer);
             if (vrc != VERR_NET_ADDRESS_IN_USE)
                 break;
@@ -798 +800 @@
         if (RT_SUCCESS(vrc))
         {
-            HRESULT hrc = pMachine->COMSETTER(LiveMigrationPort)(uPort);
+            HRESULT hrc = pMachine->COMSETTER(TeleporterPort)(uPort);
             if (FAILED(hrc))
             {
@@ -804 +806 @@
                 return VERR_GENERAL_FAILURE;
             }
+/** @todo Should undo this upon return. */
         }
     }
@@ -813 +816 @@
      */
     RTTIMERLR hTimerLR;
-    vrc = RTTimerLRCreateEx(&hTimerLR, 0 /*ns*/, RTTIMER_FLAGS_CPU_ANY, migrationTimeout, hServer);
+    vrc = RTTimerLRCreateEx(&hTimerLR, 0 /*ns*/, RTTIMER_FLAGS_CPU_ANY, teleporterTimeout, hServer);
     if (RT_SUCCESS(vrc))
     {
@@ -822 +825 @@
              * Do the job, when it returns we're done.
              */
-            MigrationStateDst State(this, pVM, pMachine, &hTimerLR);
+            TeleporterStateTrg State(this, pVM, pMachine, &hTimerLR);
             State.mstrPassword      = strPassword;
             State.mhServer          = hServer;
             State.mpvVMCallbackTask = pvVMCallbackTask;
 
-            vrc = RTTcpServerListen(hServer, Console::migrationDstServeConnection, &State);
+            vrc = RTTcpServerListen(hServer, Console::teleporterTrgServeConnection, &State);
             if (vrc == VERR_TCP_SERVER_STOP)
                 vrc = State.mRc;
@@ -839 +842 @@
             else
             {
-                LogRel(("Migration: RTTcpServerListen -> %Rrc\n", vrc));
+                LogRel(("Teleporter: RTTcpServerListen -> %Rrc\n", vrc));
             }
         }
@@ -851 +854 @@
 
 
-static int migrationTcpWriteACK(MigrationStateDst *pState)
+static int teleporterTcpWriteACK(TeleporterStateTrg *pState)
 {
     int rc = RTTcpWrite(pState->mhSocket, "ACK\n", sizeof("ACK\n") - 1);
     if (RT_FAILURE(rc))
-        LogRel(("Migration: RTTcpWrite(,ACK,) -> %Rrc\n", rc));
+        LogRel(("Teleporter: RTTcpWrite(,ACK,) -> %Rrc\n", rc));
     RTTcpFlush(pState->mhSocket);
     return rc;
@@ -861 +864 @@
 
 
-static int migrationTcpWriteNACK(MigrationStateDst *pState, int32_t rc2)
+static int teleporterTcpWriteNACK(TeleporterStateTrg *pState, int32_t rc2)
 {
     char    szMsg[64];
@@ -867 +870 @@
     int rc = RTTcpWrite(pState->mhSocket, szMsg, cch);
     if (RT_FAILURE(rc))
-        LogRel(("Migration: RTTcpWrite(,%s,%zu) -> %Rrc\n", szMsg, cch, rc));
+        LogRel(("Teleporter: RTTcpWrite(,%s,%zu) -> %Rrc\n", szMsg, cch, rc));
     RTTcpFlush(pState->mhSocket);
     return rc;
@@ -877 +880 @@
  */
 /*static*/ DECLCALLBACK(int)
-Console::migrationDstServeConnection(RTSOCKET Sock, void *pvUser)
-{
-    MigrationStateDst *pState = (MigrationStateDst *)pvUser;
+Console::teleporterTrgServeConnection(RTSOCKET Sock, void *pvUser)
+{
+    TeleporterStateTrg *pState = (TeleporterStateTrg *)pvUser;
     pState->mhSocket = Sock;
 
@@ -888 +891 @@
     if (RT_FAILURE(vrc))
     {
-        LogRel(("Migration: Failed to write welcome message: %Rrc\n", vrc));
+        LogRel(("Teleporter: Failed to write welcome message: %Rrc\n", vrc));
         return VINF_SUCCESS;
     }
 
     /*
-     * Password (includes '\n', see migrationDst).  If it's right, tell
+     * Password (includes '\n', see teleporterTrg).  If it's right, tell
      * the TCP server to stop listening (frees up host resources and makes sure
      * this is the last connection attempt).
@@ -907 +910 @@
         {
             if (RT_FAILURE(vrc))
-                LogRel(("Migration: Password read failure (off=%u): %Rrc\n", off, vrc));
+                LogRel(("Teleporter: Password read failure (off=%u): %Rrc\n", off, vrc));
             else
-                LogRel(("Migration: Invalid password (off=%u)\n", off));
-            migrationTcpWriteNACK(pState, VERR_AUTHENTICATION_FAILURE);
+                LogRel(("Teleporter: Invalid password (off=%u)\n", off));
+            teleporterTcpWriteNACK(pState, VERR_AUTHENTICATION_FAILURE);
             return VINF_SUCCESS;
         }
         off++;
     }
-    vrc = migrationTcpWriteACK(pState);
+    vrc = teleporterTcpWriteACK(pState);
     if (RT_FAILURE(vrc))
         return vrc;
@@ -929 +932 @@
     {
         char szCmd[128];
-        vrc = migrationTcpReadLine(pState, szCmd, sizeof(szCmd));
+        vrc = teleporterTcpReadLine(pState, szCmd, sizeof(szCmd));
         if (RT_FAILURE(vrc))
             break;
@@ -935 +938 @@
         if (!strcmp(szCmd, "load"))
         {
-            vrc = migrationTcpWriteACK(pState);
+            vrc = teleporterTcpWriteACK(pState);
             if (RT_FAILURE(vrc))
                 break;
 
             pState->moffStream = 0;
-            void *pvUser = static_cast<void *>(static_cast<MigrationState *>(pState));
-            vrc = VMR3LoadFromStream(pState->mpVM, &g_migrationTcpOps, pvUser,
+            void *pvUser = static_cast<void *>(static_cast<TeleporterState *>(pState));
+            vrc = VMR3LoadFromStream(pState->mpVM, &g_teleporterTcpOps, pvUser,
                                      Console::stateProgressCallback, pState->mpvVMCallbackTask);
             if (RT_FAILURE(vrc))
             {
-                LogRel(("Migration: VMR3LoadFromStream -> %Rrc\n", vrc));
-                migrationTcpWriteNACK(pState, vrc);
+                LogRel(("Teleporter: VMR3LoadFromStream -> %Rrc\n", vrc));
+                teleporterTcpWriteNACK(pState, vrc);
                 break;
             }
@@ -953 +956 @@
             pState->mfStopReading = false;
             size_t cbRead;
-            vrc = migrationTcpOpRead(pvUser, pState->moffStream, szCmd, 1, &cbRead);
+            vrc = teleporterTcpOpRead(pvUser, pState->moffStream, szCmd, 1, &cbRead);
             if (vrc != VERR_EOF)
             {
-                LogRel(("Migration: Draining migrationTcpOpRead -> %Rrc\n", vrc));
-                migrationTcpWriteNACK(pState, vrc);
+                LogRel(("Teleporter: Draining teleporterTcpOpRead -> %Rrc\n", vrc));
+                teleporterTcpWriteNACK(pState, vrc);
                 break;
             }
 
-            vrc = migrationTcpWriteACK(pState);
+            vrc = teleporterTcpWriteACK(pState);
             if (RT_FAILURE(vrc))
                 break;
@@ -969 +972 @@
         else if (!strcmp(szCmd, "done"))
         {
-            vrc = migrationTcpWriteACK(pState);
+            vrc = teleporterTcpWriteACK(pState);
             break;
         }
         else
         {
-            LogRel(("Migration: Unknown command '%s' (%.*Rhxs)\n", szCmd, strlen(szCmd), szCmd));
+            LogRel(("Teleporter: Unknown command '%s' (%.*Rhxs)\n", szCmd, strlen(szCmd), szCmd));
             vrc = VERR_NOT_IMPLEMENTED;
-            migrationTcpWriteNACK(pState, vrc);
+            teleporterTcpWriteNACK(pState, vrc);
             break;
         }

trunk/src/VBox/Main/Global.cpp

@@ -197 +197 @@
         case MachineState_Saving:       return "Saving";
         case MachineState_Restoring:    return "Restoring";
-        case MachineState_MigratingFrom:return "MigratingFrom";
+        case MachineState_TeleportingFrom: return "TeleportingFrom";
         case MachineState_Discarding:   return "Discarding";
         case MachineState_SettingUp:    return "SettingUp";

trunk/src/VBox/Main/MachineImpl.cpp

@@ -155 +155 @@
 
     mNameSync = TRUE;
-    mLiveMigrationTarget = FALSE;
-    mLiveMigrationPort = 0;
+    mTeleporterEnabled = FALSE;
+    mTeleporterPort = 0;
 
     /* mName, mOSTypeId, mSnapshotFolder, mSnapshotFolderFull are initialized in
@@ -1857 +1857 @@
 
 STDMETHODIMP
-Machine::COMGETTER(LiveMigrationTarget)(BOOL *aEnabled)
+Machine::COMGETTER(TeleporterEnabled)(BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -1866 +1866 @@
     AutoReadLock alock(this);
 
-    *aEnabled = mUserData->mLiveMigrationTarget;
+    *aEnabled = mUserData->mTeleporterEnabled;
 
     return S_OK;
@@ -1872 +1872 @@
 
 STDMETHODIMP
-Machine::COMSETTER(LiveMigrationTarget)(BOOL aEnabled)
+Machine::COMSETTER(TeleporterEnabled)(BOOL aEnabled)
 {
     AutoCaller autoCaller(this);
@@ -1893 +1893 @@
 
     mUserData.backup();
-    mUserData->mLiveMigrationTarget = aEnabled;
+    mUserData->mTeleporterEnabled = aEnabled;
 
     return S_OK;
@@ -1899 +1899 @@
 
 STDMETHODIMP
-Machine::COMGETTER(LiveMigrationPort)(ULONG *aPort)
+Machine::COMGETTER(TeleporterPort)(ULONG *aPort)
 {
     CheckComArgOutPointerValid(aPort);
@@ -1908 +1908 @@
     AutoReadLock alock(this);
 
-    *aPort = mUserData->mLiveMigrationPort;
+    *aPort = mUserData->mTeleporterPort;
 
     return S_OK;
@@ -1914 +1914 @@
 
 STDMETHODIMP
-Machine::COMSETTER(LiveMigrationPort)(ULONG aPort)
+Machine::COMSETTER(TeleporterPort)(ULONG aPort)
 {
     if (aPort >= _64K)
@@ -1928 +1928 @@
 
     mUserData.backup();
-    mUserData->mLiveMigrationPort = aPort;
+    mUserData->mTeleporterPort = aPort;
 
     return S_OK;
@@ -1934 +1934 @@
 
 STDMETHODIMP
-Machine::COMGETTER(LiveMigrationPassword)(BSTR *aPassword)
-{
-    CheckComArgOutPointerValid(aPassword);
+Machine::COMGETTER(TeleporterAddress)(BSTR *aAddress)
+{
+    CheckComArgOutPointerValid(aAddress);
 
     AutoCaller autoCaller(this);
@@ -1943 +1943 @@
     AutoReadLock alock(this);
 
-    mUserData->mLiveMigrationPassword.cloneTo(aPassword);
+    mUserData->mTeleporterAddress.cloneTo(aAddress);
 
     return S_OK;
@@ -1949 +1949 @@
 
 STDMETHODIMP
-Machine::COMSETTER(LiveMigrationPassword)(IN_BSTR aPassword)
+Machine::COMSETTER(TeleporterAddress)(IN_BSTR aAddress)
 {
     AutoCaller autoCaller(this);
@@ -1960 +1960 @@
 
     mUserData.backup();
-    mUserData->mLiveMigrationPassword = aPassword;
+    mUserData->mTeleporterAddress = aAddress;
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMGETTER(TeleporterPassword)(BSTR *aPassword)
+{
+    CheckComArgOutPointerValid(aPassword);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    mUserData->mTeleporterPassword.cloneTo(aPassword);
+
+    return S_OK;
+}
+
+STDMETHODIMP
+Machine::COMSETTER(TeleporterPassword)(IN_BSTR aPassword)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    mUserData.backup();
+    mUserData->mTeleporterPassword = aPassword;
 
     return S_OK;
@@ -5044 +5076 @@
         mData->mLastStateChange = mData->m_pMachineConfigFile->timeLastStateChange;
 
-        /* Live migration */
-        mUserData->mLiveMigrationTarget = mData->m_pMachineConfigFile->fLiveMigrationTarget;
-        mUserData->mLiveMigrationPort = mData->m_pMachineConfigFile->uLiveMigrationPort;
-        mUserData->mLiveMigrationPassword = mData->m_pMachineConfigFile->strLiveMigrationPassword;
+        /* teleportation */
+        mUserData->mTeleporterEnabled  = mData->m_pMachineConfigFile->fTeleporterEnabled;
+        mUserData->mTeleporterPort     = mData->m_pMachineConfigFile->uTeleporterPort;
+        mUserData->mTeleporterAddress  = mData->m_pMachineConfigFile->strTeleporterAddress;
+        mUserData->mTeleporterPassword = mData->m_pMachineConfigFile->strTeleporterPassword;
 
         /*
@@ -6041 +6074 @@
         mData->m_pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted);
 
-        mData->m_pMachineConfigFile->fLiveMigrationTarget = !!mUserData->mLiveMigrationTarget;
-        mData->m_pMachineConfigFile->uLiveMigrationPort = mUserData->mLiveMigrationPort;
-        mData->m_pMachineConfigFile->strLiveMigrationPassword = mUserData->mLiveMigrationPassword;
+        mData->m_pMachineConfigFile->fTeleporterEnabled    = !!mUserData->mTeleporterEnabled;
+        mData->m_pMachineConfigFile->uTeleporterPort       = mUserData->mTeleporterPort;
+        mData->m_pMachineConfigFile->strTeleporterAddress  = mUserData->mTeleporterAddress;
+        mData->m_pMachineConfigFile->strTeleporterPassword = mUserData->mTeleporterPassword;
 
         rc = saveHardware(mData->m_pMachineConfigFile->hardwareMachine);
@@ -9284 +9318 @@
         case MachineState_Starting:
         case MachineState_Restoring:
-        case MachineState_MigratingFrom:
+        case MachineState_TeleportingFrom:
         case MachineState_Paused:
         case MachineState_Running:
@@ -10160 +10194 @@
     AssertReturn(   mData->mMachineState == MachineState_Starting
                  || mData->mMachineState == MachineState_Restoring
-                 || mData->mMachineState == MachineState_MigratingFrom, E_FAIL);
+                 || mData->mMachineState == MachineState_TeleportingFrom, E_FAIL);
 
     typedef std::list <ComPtr<IMedium> > MediaList;
@@ -10348 +10382 @@
             && aMachineState   == MachineState_Restoring)
         || (   oldMachineState == MachineState_PoweredOff
-            && aMachineState   == MachineState_MigratingFrom)
+            && aMachineState   == MachineState_TeleportingFrom)
         || (   oldMachineState <  MachineState_Running /* any other OFF state */
             && aMachineState   == MachineState_Starting)
@@ -10420 +10454 @@
     if (   aMachineState == MachineState_Starting
         || aMachineState == MachineState_Restoring
-        || aMachineState == MachineState_MigratingFrom
+        || aMachineState == MachineState_TeleportingFrom
        )
     {

trunk/src/VBox/Main/Makefile.kmk

@@ -462 +462 @@
 
 
-if defined(VBOX_WITH_CROGL) || defined(VBOX_WITH_VIDEOHWACCEL) 
+if defined(VBOX_WITH_CROGL) || defined(VBOX_WITH_VIDEOHWACCEL)
  ifneq ($(KBUILD_TARGET),darwin)
   #
@@ -613 +613 @@
         ConsoleImpl.cpp \
         ConsoleImpl2.cpp \
-        ConsoleImpl-LiveMigration.cpp \
+        ConsoleImplTeleporter.cpp \
         ConsoleVRDPServer.cpp \
         GuestImpl.cpp \

trunk/src/VBox/Main/cbinding/tstXPCOMCCall.c

@@ -84 +84 @@
         case MachineState_Saving:              return "Saving";
         case MachineState_Restoring:           return "Restoring";
-        case MachineState_MigratingFrom:       return "MigratingFrom";
+        case MachineState_TeleportingFrom:     return "TeleportingFrom";
         case MachineState_Discarding:          return "Discarding";
         case MachineState_SettingUp:           return "SettingUp";

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -473 +473 @@
   <enum
     name="MachineState"
-    uuid="f532545d-9ae7-4402-8b5f-1ea7d778cfc7"
+    uuid="0f4cc50c-e1cc-4cde-ae7a-e6164bac5ba2"
   >
     <desc>
@@ -673 +673 @@
       </desc>
     </const>
-    <const name="MigratingFrom"         value="11">
-      <desc>
-        Migrating the machine state from another host or process.
+    <const name="TeleportingFrom"       value="11">
+      <desc>
+        Teleporting the machine state from another host or process.
       </desc>
     </const>
@@ -778 +778 @@
       <desc>
         This setting determines whether VirtualBox will expose a synthetic CPU to the guest to allow
-        live migration between host systems that differ significantly.
+        teleporting between host systems that differ significantly.
       </desc>
     </const>
@@ -4072 +4072 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="e8e1c6a9-679e-4a73-a1e5-d9a81027fbda"
+     uuid="d867a463-0f78-4ec7-a876-8da001464537"
      wsmap="managed"
      >
@@ -4528 +4528 @@
     </attribute>
 
-    <attribute name="liveMigrationTarget" type="boolean">
-      <desc>
-        When set to @a true, the virtual machine becomes a live migration
-        target.  This can only set to @a true when the VM is in the @a
-        PoweredOff or @a Aborted state.
+    <attribute name="teleporterEnabled" type="boolean">
+      <desc>
+        When set to @a true, the virtual machine becomes a target teleporter
+        the next time it is powered on.  This can only set to @a true when the
+        VM is in the @a PoweredOff or @a Aborted state.
 
         This property is automatically set to @a false when the VM is powered
@@ -4539 +4539 @@
     </attribute>
 
-    <attribute name="liveMigrationPort" type="unsigned long">
-      <desc>
-        The TCP port used for live migration.  This can only be set when the
-        VM is in the @a PoweredOff state.
-
-        0 means the port is automatically selected and the source machine will
-        have to be told where to connected after the destination has been
-        started.
-      </desc>
-    </attribute>
-
-    <attribute name="liveMigrationPassword" type="wstring">
-      <desc>
-        The password the live migration target will check for.
+    <attribute name="teleporterPort" type="unsigned long">
+      <desc>
+        The TCP port the target teleporter will listen for incoming
+        teleportations on.
+
+        0 means the port is automatically selected upon power on.  The actual
+        value can be read from this property while the machine is waiting for
+        incoming teleportations.
+      </desc>
+    </attribute>
+
+    <attribute name="teleporterAddress" type="wstring">
+      <desc>
+        The address the target teleporter will listen on.  If set to an empty
+        string, it will listen on all addresses.
+      </desc>
+    </attribute>
+
+    <attribute name="teleporterPassword" type="wstring">
+      <desc>
+        The password the to check for on the target teleporter.  This is just a
+        very basic measure to prevent simple hacks and operators accidentally
+        beaming a virtual machine to the wrong place.
       </desc>
     </attribute>
@@ -6079 +6088 @@
   <interface
      name="IConsole" extends="$unknown"
-     uuid="c47486e1-3d99-4212-b1c5-86451978999d"
+     uuid="03312360-0364-4b7a-ad71-1a8450133774"
      wsmap="managed"
      >
@@ -6817 +6826 @@
     </method>
 
-    <method name="migrate">
-      <desc>
-        Migrate the VM to a different host machine.
+    <method name="teleport">
+      <desc>
+        Teleport the VM to a different host machine or process.
 
         TODO explain the details.
@@ -6828 +6837 @@
       </desc>
       <param name="hostname" type="wstring" dir="in">
-        <desc>The name or IP of the host to migrate to.</desc>
+        <desc>The name or IP of the host to teleport to.</desc>
       </param>
       <param name="tcpport" type="unsigned long" dir="in">

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -34 +34 @@
 class Display;
 class MachineDebugger;
-class MigrationStateSrc;
+class TeleporterStateSrc;
 class OUSBDevice;
 class RemoteUSBDevice;
@@ -148 +148 @@
     STDMETHOD(DiscardCurrentState) (IProgress **aProgress);
     STDMETHOD(DiscardCurrentSnapshotAndState) (IProgress **aProgress);
-    STDMETHOD(Migrate)(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress);
+    STDMETHOD(Teleport)(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress);
     STDMETHOD(RegisterCallback) (IConsoleCallback *aCallback);
     STDMETHOD(UnregisterCallback)(IConsoleCallback *aCallback);
@@ -517 +517 @@
 #endif
 
-    /** @name Live migration support
+    /** @name Teleporter support
      * @{ */
-    static DECLCALLBACK(int)    migrationSrcThreadWrapper(RTTHREAD hThread, void *pvUser);
-    HRESULT                     migrationSrc(MigrationStateSrc *pState);
-    HRESULT                     migrationSrcReadACK(MigrationStateSrc *pState, const char *pszWhich, const char *pszNAckMsg = NULL);
-    HRESULT                     migrationSrcSubmitCommand(MigrationStateSrc *pState, const char *pszCommand);
-    int                         migrationDst(PVM pVM, IMachine *pMachine, bool fStartPaused, void *pvVMCallbackTask);
-    static DECLCALLBACK(int)    migrationDstServeConnection(RTSOCKET Sock, void *pvUser);
+    static DECLCALLBACK(int)    teleporterSrcThreadWrapper(RTTHREAD hThread, void *pvUser);
+    HRESULT                     teleporterSrc(TeleporterStateSrc *pState);
+    HRESULT                     teleporterSrcReadACK(TeleporterStateSrc *pState, const char *pszWhich, const char *pszNAckMsg = NULL);
+    HRESULT                     teleporterSrcSubmitCommand(TeleporterStateSrc *pState, const char *pszCommand);
+    int                         teleporterTrg(PVM pVM, IMachine *pMachine, bool fStartPaused, void *pvVMCallbackTask);
+    static DECLCALLBACK(int)    teleporterTrgServeConnection(RTSOCKET Sock, void *pvUser);
     /** @} */
 
@@ -632 +632 @@
 };
 
-#endif // ____H_CONSOLEIMPL
+#endif // !____H_CONSOLEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/MachineImpl.h

@@ -228 +228 @@
         bool operator==(const UserData &that) const
         {
-            return this == &that ||
-                   (mName == that.mName &&
-                    mNameSync == that.mNameSync &&
-                    mDescription == that.mDescription &&
-                    mOSTypeId == that.mOSTypeId &&
-                    mSnapshotFolderFull == that.mSnapshotFolderFull &&
-                    mLiveMigrationTarget == that.mLiveMigrationTarget &&
-                    mLiveMigrationPort == that.mLiveMigrationPort &&
-                    mLiveMigrationPassword == that.mLiveMigrationPassword);
+            return this == &that
+                || (   mName                 == that.mName
+                    && mNameSync             == that.mNameSync
+                    && mDescription          == that.mDescription
+                    && mOSTypeId             == that.mOSTypeId
+                    && mSnapshotFolderFull   == that.mSnapshotFolderFull
+                    && mTeleporterEnabled    == that.mTeleporterEnabled
+                    && mTeleporterPort       == that.mTeleporterPort
+                    && mTeleporterAddress    == that.mTeleporterAddress
+                    && mTeleporterPassword   == that.mTeleporterPassword);
         }
 
@@ -245 +246 @@
         Bstr    mSnapshotFolder;
         Bstr    mSnapshotFolderFull;
-        BOOL    mLiveMigrationTarget;
-        ULONG   mLiveMigrationPort;
-        Bstr    mLiveMigrationPassword;
+        BOOL    mTeleporterEnabled;
+        ULONG   mTeleporterPort;
+        Bstr    mTeleporterAddress;
+        Bstr    mTeleporterPassword;
     };
 
@@ -560 +562 @@
     STDMETHOD(COMSETTER(GuestPropertyNotificationPatterns))(IN_BSTR aPattern);
     STDMETHOD(COMGETTER(StorageControllers))(ComSafeArrayOut(IStorageController *, aStorageControllers));
-    STDMETHOD(COMGETTER(LiveMigrationTarget))(BOOL *aEnabled);
-    STDMETHOD(COMSETTER(LiveMigrationTarget))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(LiveMigrationPort))(ULONG *aPort);
-    STDMETHOD(COMSETTER(LiveMigrationPort))(ULONG aPort);
-    STDMETHOD(COMGETTER(LiveMigrationPassword))(BSTR *aPassword);
-    STDMETHOD(COMSETTER(LiveMigrationPassword))(IN_BSTR aPassword);
+    STDMETHOD(COMGETTER(TeleporterEnabled))(BOOL *aEnabled);
+    STDMETHOD(COMSETTER(TeleporterEnabled))(BOOL aEnabled);
+    STDMETHOD(COMGETTER(TeleporterPort))(ULONG *aPort);
+    STDMETHOD(COMSETTER(TeleporterPort))(ULONG aPort);
+    STDMETHOD(COMGETTER(TeleporterAddress))(BSTR *aAddress);
+    STDMETHOD(COMSETTER(TeleporterAddress))(IN_BSTR aAddress);
+    STDMETHOD(COMGETTER(TeleporterPassword))(BSTR *aPassword);
+    STDMETHOD(COMSETTER(TeleporterPassword))(IN_BSTR aPassword);
 
     // IMachine methods

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

@@ -2203 +2203 @@
             // 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 = "";
+        if (!elmMachine.getAttributeValue("teleporterEnabled", fTeleporterEnabled) /** @todo Teleportation: remove liveMigration* in a couple of days. */
+         && !elmMachine.getAttributeValue("liveMigrationTarget", fTeleporterEnabled))
+            fTeleporterEnabled = false;
+        if (!elmMachine.getAttributeValue("teleporterPort", uTeleporterPort)
+         && !elmMachine.getAttributeValue("liveMigrationPort", uTeleporterPort))
+            uTeleporterPort = 0;
+        if (!elmMachine.getAttributeValue("teleporterAddress", strTeleporterAddress))
+            strTeleporterAddress = "";
+        if (!elmMachine.getAttributeValue("teleporterPassword", strTeleporterPassword)
+         && !elmMachine.getAttributeValue("liveMigrationPassword", strTeleporterPassword))
+            strTeleporterPassword = "";
 
         // parse Hardware before the other elements because other things depend on it
@@ -2273 +2278 @@
     : ConfigFileBase(pstrFilename),
       fNameSync(true),
-      fLiveMigrationTarget(false),
-      uLiveMigrationPort(0),
+      fTeleporterEnabled(false),
+      uTeleporterPort(0),
       fCurrentStateModified(true),
       fAborted(false)
@@ -2873 +2878 @@
     }
 
-#ifdef VBOX_WITH_LIVE_MIGRATION
     if (    m->sv < SettingsVersion_v1_9
-        &&  (   fLiveMigrationTarget
-             || uLiveMigrationPort
-             || !strLiveMigrationPassword.isEmpty()
+        &&  (   fTeleporterEnabled
+             || uTeleporterPort
+             || !strTeleporterAddress.isEmpty()
+             || !strTeleporterPassword.isEmpty()
             )
        )
         m->sv = SettingsVersion_v1_9;
-#endif
 }
 
@@ -2921 +2925 @@
         if (fAborted)
             pelmMachine->setAttribute("aborted", fAborted);
-#ifdef VBOX_WITH_LIVE_MIGRATION /** @todo LiveMigration: Checkout how the file format versioning is done. */
+#ifdef VBOX_WITH_LIVE_MIGRATION /** @todo Teleportation: Enable in a bit. */
         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);
+            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