Changeset 31728 in vbox for trunk/src/VBox/Main
- Timestamp:
- Aug 17, 2010 12:52:17 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/ConsoleImpl.cpp
r31707 r31728 86 86 #include <VBox/vusb.h> 87 87 #include <VBox/mm.h> 88 #include <VBox/ftm.h> 88 89 #include <VBox/ssm.h> 89 90 #include <VBox/version.h> … … 216 217 mStartPaused(false), 217 218 mTeleporterEnabled(FALSE), 218 m FaultToleranceSyncEnabled(FALSE)219 mEnmFaultToleranceState(FaultToleranceState_Inactive) 219 220 {} 220 221 … … 224 225 bool mStartPaused; 225 226 BOOL mTeleporterEnabled; 226 BOOL mFaultToleranceSyncEnabled;227 FaultToleranceState_T mEnmFaultToleranceState; 227 228 228 229 /* array of progress objects for hard disk reset operations */ … … 5293 5294 task->mSavedStateFile = savedStateFile; 5294 5295 task->mTeleporterEnabled = fTeleporterEnabled; 5295 task->m FaultToleranceSyncEnabled = fFaultToleranceSyncEnabled;5296 task->mEnmFaultToleranceState = enmFaultToleranceState; 5296 5297 5297 5298 /* Reset differencing hard disks for which autoReset is true, … … 7273 7274 */ 7274 7275 if ( !task->mTeleporterEnabled 7275 && !task->mFaultToleranceSyncEnabled)7276 && task->mEnmFaultToleranceState != FaultToleranceState_Target) 7276 7277 { 7277 7278 rc = console->mControl->LockMedia(); … … 7455 7456 } 7456 7457 } 7457 else if (task->m FaultToleranceSyncEnabled)7458 else if (task->mEnmFaultToleranceState != FaultToleranceState_Inactive) 7458 7459 { 7459 /** @todo */ 7460 rc = E_NOTIMPL; 7460 /* 7461 * Get the config. 7462 */ 7463 ULONG uPort; 7464 ULONG uInterval; 7465 Bstr bstrAddress; 7466 7467 rc = pMachine->COMGETTER(FaultTolerancePort)(&uPort); 7468 if (SUCCEEDED(rc)) 7469 { 7470 rc = pMachine->COMGETTER(FaultToleranceSyncInterval)(&uInterval); 7471 if (SUCCEEDED(rc)) 7472 rc = pMachine->COMGETTER(FaultToleranceAddress)(bstrAddress.asOutParam()); 7473 } 7474 if (SUCCEEDED(rc)) 7475 { 7476 Utf8Str strAddress(bstrAddress); 7477 const char *pszAddress = strAddress.isEmpty() ? NULL : strAddress.c_str(); 7478 7479 /* Start FT syncing. */ 7480 vrc = FTMR3PowerOn(pVM, (task->mEnmFaultToleranceState == FaultToleranceState_Source) /* fSource */, uInterval, pszAddress, uPort); 7481 AssertRC(vrc); 7482 } 7461 7483 } 7462 7484 else if (task->mStartPaused)
Note:
See TracChangeset
for help on using the changeset viewer.