Changeset 31766 in vbox

Timestamp:

Aug 18, 2010 2:31:16 PM (15 years ago)

Author:

vboxsync

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

64948

Message:

FT updates

Location:

trunk

Files:

• include/VBox/ftm.h (modified) (1 diff)
• src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/VMM/FTM.cpp (modified) (1 diff)

trunk/include/VBox/ftm.h ¶

@@ -44 +44 @@
 VMMR3DECL(int) FTMR3Init(PVM pVM);
 VMMR3DECL(int) FTMR3Term(PVM pVM);
-VMMR3DECL(int) FTMR3StandbyCancel(PVM pVM);
+VMMR3DECL(int) FTMR3CancelStandby(PVM pVM);
 
 #endif /* IN_RING3 */

trunk/src/VBox/Main/ConsoleImpl.cpp ¶

@@ -7203 +7203 @@
 
 /**
+ * Progress cancelation callback for fault tolerance VM poweron
+ */
+static void faultToleranceProgressCancelCallback(void *pvUser)
+{
+    PVM pVM = (PVM)pvUser;
+
+    if (pVM)
+        FTMR3CancelStandby(pVM);
+}
+
+/**
  * Thread function which starts the VM (also from saved state) and
  * track progress.
@@ -7474 +7485 @@
                             rc = pMachine->COMGETTER(FaultTolerancePassword)(bstrPassword.asOutParam());
                     }
-                    if (SUCCEEDED(rc))
+                    if (task->mProgress->setCancelCallback(faultToleranceProgressCancelCallback, pVM))
                     {
-                        Utf8Str strAddress(bstrAddress);
-                        const char *pszAddress = strAddress.isEmpty() ? NULL : strAddress.c_str();
-                        Utf8Str strPassword(bstrPassword);
-                        const char *pszPassword = strPassword.isEmpty() ? NULL : strPassword.c_str();
-
-                        /** @todo set progress cancel callback! */
-
-                        /* Power on the FT enabled VM. */
-                        vrc = FTMR3PowerOn(pVM, (task->mEnmFaultToleranceState == FaultToleranceState_Master) /* fMaster */, uInterval, pszAddress, uPort, pszPassword);
-                        AssertRC(vrc);
+                        if (SUCCEEDED(rc))
+                        {
+                            Utf8Str strAddress(bstrAddress);
+                            const char *pszAddress = strAddress.isEmpty() ? NULL : strAddress.c_str();
+                            Utf8Str strPassword(bstrPassword);
+                            const char *pszPassword = strPassword.isEmpty() ? NULL : strPassword.c_str();
+    
+                            /* Power on the FT enabled VM. */
+                            vrc = FTMR3PowerOn(pVM, (task->mEnmFaultToleranceState == FaultToleranceState_Master) /* fMaster */, uInterval, pszAddress, uPort, pszPassword);
+                            AssertRC(vrc);
+                        }
+                        task->mProgress->setCancelCallback(NULL, NULL);
                     }
+                    else
+                        rc = E_FAIL;
                 }
                 else if (task->mStartPaused)

trunk/src/VBox/VMM/FTM.cpp ¶

@@ -172 +172 @@
  * @param   pVM         The VM to power on.
  */
-VMMR3DECL(int) FTMR3StandbyCancel(PVM pVM)
+VMMR3DECL(int) FTMR3CancelStandby(PVM pVM)
 {
     AssertReturn(!pVM->fFaultTolerantMaster, VERR_NOT_SUPPORTED);