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

Timestamp:

Oct 8, 2009 10:14:29 PM (16 years ago)

Author:

vboxsync

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

53318

Message:

Main: A little more live migration bits.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl-LiveMigration.cpp (modified) (13 diffs)
• ConsoleImpl.cpp (modified) (1 diff)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl-LiveMigration.cpp

@@ -45 +45 @@
  * Argument package for Console::migrationServeConnection.
  */
-typedef struct MIGRATIONSERVEARGS
+typedef struct MIGRATIONSTATE
 {
     Console    *pConsole;
@@ -51 +51 @@
     PVM         pVM;
     const char *pszPassword;
-    RTTIMERLR   hTimer;
-} MIGRATIONSERVEARGS;
-typedef MIGRATIONSERVEARGS *PMIGRATIONSERVEARGS;
+    void       *pvVMCallbackTask;
+    RTSOCKET    hSocket;
+    uint64_t    offStream;
+    int         rc;
+} MIGRATIONSTATE;
+typedef MIGRATIONSTATE *PMIGRATIONSTATE;
 
 
@@ -62 +65 @@
 
 
+/**
+ * @copydoc SSMSTRMOPS::pfnWrite
+ */
+static DECLCALLBACK(int) migrationTcpOpWrite(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite)
+{
+    PMIGRATIONSTATE pState = (PMIGRATIONSTATE)pvUser;
+    int rc = RTTcpWrite(pState->hSocket, pvBuf, cbToWrite);
+    if (RT_SUCCESS(rc))
+    {
+        pState->offStream += cbToWrite;
+        return VINF_SUCCESS;
+    }
+    return rc;
+}
+
+
+/**
+ * @copydoc SSMSTRMOPS::pfnRead
+ */
+static DECLCALLBACK(int) migrationTcpOpRead(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead)
+{
+    PMIGRATIONSTATE pState = (PMIGRATIONSTATE)pvUser;
+    int rc = RTTcpRead(pState->hSocket, pvBuf, cbToRead, pcbRead);
+    if (RT_SUCCESS(rc))
+    {
+        pState->offStream += pcbRead ? *pcbRead : cbToRead;
+        return VINF_SUCCESS;
+    }
+    return rc;
+}
+
+
+/**
+ * @copydoc SSMSTRMOPS::pfnSeek
+ */
+static DECLCALLBACK(int) migrationTcpOpSeek(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual)
+{
+    return VERR_NOT_SUPPORTED;
+}
+
+
+/**
+ * @copydoc SSMSTRMOPS::pfnTell
+ */
+static DECLCALLBACK(uint64_t) migrationTcpOpTell(void *pvUser)
+{
+    PMIGRATIONSTATE pState = (PMIGRATIONSTATE)pvUser;
+    return pState->offStream;
+}
+
+
+/**
+ * @copydoc SSMSTRMOPS::pfnSize
+ */
+static DECLCALLBACK(int) migrationTcpOpSize(void *pvUser, uint64_t *pcb)
+{
+    return VERR_NOT_SUPPORTED;
+}
+
+
+/**
+ * @copydoc SSMSTRMOPS::pfnClose
+ */
+static DECLCALLBACK(int) migrationTcpOpClose(void *pvUser)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Method table for a TCP based stream.
+ */
+static SSMSTRMOPS const g_migrationTcpOps =
+{
+    SSMSTRMOPS_VERSION,
+    migrationTcpOpWrite,
+    migrationTcpOpRead,
+    migrationTcpOpSeek,
+    migrationTcpOpTell,
+    migrationTcpOpSize,
+    migrationTcpOpClose,
+    SSMSTRMOPS_VERSION
+};
+
 
 /**
@@ -73 +160 @@
 
 
+/**
+ * Start live migration to the specified target.
+ *
+ * @returns COM status code.
+ *
+ * @param   aHostname   The name of the target host.
+ * @param   aPort       The TCP port number.
+ * @param   aPassword   The password.
+ * @param   aProgress   Where to return the progress object.
+ */
 STDMETHODIMP
 Console::Migrate(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, IProgress **aProgress)
 {
+    /*
+     * Validate parameters.
+     */
+
+    /*
+     * Try change the state, create a progress object and spawn a worker thread.
+     */
+
     return E_FAIL;
 }
@@ -87 +192 @@
  * @param   pVM                 The VM handle
  * @param   pMachine            The IMachine for the virtual machine.
+ * @param   pvVMCallbackTask    The callback task pointer for
+ *                              stateProgressCallback().
  */
 int
-Console::migrationLoadRemote(PVM pVM, IMachine *pMachine)
+Console::migrationLoadRemote(PVM pVM, IMachine *pMachine, void *pvVMCallbackTask)
 {
     /*
@@ -140 +247 @@
 
     /*
-     * Create a timer for timing out after 5 mins.
-     */
-    RTTIMERLR hTimer;
-    rc = RTTimerLRCreateEx(&hTimer, 0, 0, migrationTimeout, hServer);
+     * Create a one-shot timer for timing out after 5 mins.
+     */
+    RTTIMERLR hTimerLR;
+    rc = RTTimerLRCreateEx(&hTimerLR, 0 /*ns*/, RTTIMER_FLAGS_CPU_ANY, migrationTimeout, hServer);
     if (RT_SUCCESS(rc))
     {
-        rc = RTTimerLRStart(hTimer, 5*60*UINT64_C(1000000000) /*ns*/);
+        rc = RTTimerLRStart(hTimerLR, 5*60*UINT64_C(1000000000) /*ns*/);
         if (RT_SUCCESS(rc))
         {
@@ -152 +259 @@
              * Do the job, when it returns we're done.
              */
-            MIGRATIONSERVEARGS Args;
-            Args.pConsole    = this;
-            Args.pMachine    = pMachine;
-            Args.pVM         = pVM;
-            Args.pszPassword = strPassword.c_str();
-            Args.hTimer      = hTimer;
-            rc = RTTcpServerListen(hServer, Console::migrationServeConnection, &Args);
-        }
-
-        RTTimerLRDestroy(hTimer);
+            MIGRATIONSTATE State;
+            State.pConsole      = this;
+            State.pMachine      = pMachine;
+            State.pVM           = pVM;
+            State.pszPassword   = strPassword.c_str();
+            State.hSocket       = NIL_RTSOCKET;
+            State.offStream     = UINT64_MAX / 2;
+            State.rc            = VINF_SUCCESS;
+
+            rc = RTTcpServerListen(hServer, Console::migrationServeConnection, &State);
+            if (rc == VERR_TCP_SERVER_STOP)
+                rc = State.rc;
+            if (RT_FAILURE(rc))
+                LogRel(("Migration: RTTcpServerListen -> %Rrc\n", rc));
+        }
+
+        RTTimerLRDestroy(hTimerLR);
     }
     RTTcpServerDestroy(hServer);
@@ -167 +281 @@
     return rc;
 }
+
 
 /**
@@ -215 +330 @@
 Console::migrationServeConnection(RTSOCKET Sock, void *pvUser)
 {
-    PMIGRATIONSERVEARGS pArgs       = (PMIGRATIONSERVEARGS)pvUser;
-    Console            *pConsole    = pArgs->pConsole;
-    IMachine           *pMachine    = pArgs->pMachine;
-    PVM                 pVM         = pArgs->pVM;
-    const char         *pszPassword = pArgs->pszPassword;
+    PMIGRATIONSTATE pState   = (PMIGRATIONSTATE)pvUser;
+    Console        *pConsole = pState->pConsole;
+    IMachine       *pMachine = pState->pMachine;
 
     /*
@@ -236 +349 @@
      * this is the last connection attempt).
      */
-    unsigned off = 0;
+    const char *pszPassword = pState->pszPassword;
+    unsigned    off = 0;
     while (pszPassword[off])
     {
@@ -256 +370 @@
      * Command processing loop.
      */
+    pState->hSocket = Sock;
     for (;;)
     {
@@ -263 +378 @@
             break;
 
-        if (!strcmp(szCmd, "state"))
-        {
-            /* restore the state. */
-        }
+        if (!strcmp(szCmd, "load"))
+        {
+            pState->offStream = 0;
+            rc = VMR3LoadFromStream(pState->pVM, &g_migrationTcpOps, pState,
+                                    Console::stateProgressCallback, pState->pvVMCallbackTask);
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("Migration: VMR3LoadFromStream -> %Rrc\n", rc));
+                break;
+            }
+        }
+        /** @todo implement config verification and hardware compatability checks. Or
+         *        maybe leave part of these to the saved state machinery? */
         else if (!strcmp(szCmd, "done"))
             break;
@@ -275 +399 @@
         }
     }
+    pState->hSocket = NIL_RTSOCKET;
 
     return VERR_TCP_SERVER_STOP;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6728 +6728 @@
                 else if (task->mLiveMigrationTarget)
                     /* -> ConsoleImpl-LiveMigration.cpp */
-                    vrc = console->migrationLoadRemote(pVM, pMachine);
+                    vrc = console->migrationLoadRemote(pVM, pMachine, static_cast<VMProgressTask*>(task.get()));
                 else if (task->mStartPaused)
                     /* done */

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

@@ -514 +514 @@
     /** @name Live migration support
      * @{ */
-    int                         migrationLoadRemote(PVM pVM, IMachine *pMachine);
+    int                         migrationLoadRemote(PVM pVM, IMachine *pMachine, void *pvVMCallbackTask);
     static DECLCALLBACK(int)    migrationServeConnection(RTSOCKET Sock, void *pvUser);
     /** @} */