Changeset 31743 in vbox

Timestamp:

Aug 18, 2010 7:58:11 AM (14 years ago)

Author:

vboxsync

Message:

FT updates for password

Location:

trunk

Files:

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

trunk/include/VBox/ftm.h

@@ -41 +41 @@
  * @{
  */
-VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort);
+VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort, const char *pszPassword);
 VMMR3DECL(int) FTMR3Init(PVM pVM);
 VMMR3DECL(int) FTMR3Term(PVM pVM);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7463 +7463 @@
                     ULONG uPort;
                     ULONG uInterval;
-                    Bstr bstrAddress;
+                    Bstr bstrAddress, bstrPassword;
 
                     rc = pMachine->COMGETTER(FaultTolerancePort)(&uPort);
@@ -7471 +7471 @@
                         if (SUCCEEDED(rc))
                             rc = pMachine->COMGETTER(FaultToleranceAddress)(bstrAddress.asOutParam());
+                        if (SUCCEEDED(rc))
+                            rc = pMachine->COMGETTER(FaultTolerancePassword)(bstrPassword.asOutParam());
                     }
                     if (SUCCEEDED(rc))
@@ -7476 +7478 @@
                         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);
+                        vrc = FTMR3PowerOn(pVM, (task->mEnmFaultToleranceState == FaultToleranceState_Master) /* fMaster */, uInterval, pszAddress, uPort, pszPassword);
                         AssertRC(vrc);
                     }

trunk/src/VBox/VMM/FTM.cpp

@@ -45 +45 @@
     /** @todo saved state for master nodes! */
     pVM->ftm.s.pszAddress     = NULL;
+    pVM->ftm.s.pszPassword    = NULL;
     pVM->fFaultTolerantMaster = false;
     return VINF_SUCCESS;
@@ -62 +63 @@
     if (pVM->ftm.s.pszAddress)
         RTMemFree(pVM->ftm.s.pszAddress);
+    if (pVM->ftm.s.pszPassword)
+        RTMemFree(pVM->ftm.s.pszPassword);
 
     return VINF_SUCCESS;
@@ -110 +113 @@
  * @param   pszAddress  Master VM address
  * @param   uPort       Master VM port
+ * @param   pszPassword FT password
  *
  * @thread      Any thread.
@@ -115 +119 @@
  * @vmstateto   PoweringOn+Running (master), PoweringOn+Running_FT (standby)
  */
-VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort)
+VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort, const char *pszPassword)
 {
     int rc;
@@ -123 +127 @@
                     ("%s\n", VMR3GetStateName(enmVMState)),
                     VERR_INTERNAL_ERROR_4);
+    AssertReturn(pszAddress, VERR_INVALID_PARAMETER);
 
-    pVM->ftm.s.uInterval  = uInterval;
-    pVM->ftm.s.uPort      = uPort;
-    pVM->ftm.s.pszAddress = RTStrDup(pszAddress);
+    pVM->ftm.s.uInterval   = uInterval;
+    pVM->ftm.s.uPort       = uPort;
+    pVM->ftm.s.pszAddress  = RTStrDup(pszAddress);
+    if (pszPassword)
+        pVM->ftm.s.pszPassword = RTStrDup(pszPassword);
     if (fMaster)
     {

trunk/src/VBox/VMM/FTMInternal.h

@@ -37 +37 @@
 {
     char       *pszAddress;
+    char       *pszPassword;
     unsigned    uPort;
     unsigned    uInterval;