Changeset 32140 in vbox

Timestamp:

Aug 31, 2010 12:47:07 PM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk

Files:

• include/VBox/ftm.h (modified) (1 diff)
• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/VMM/FTM.cpp (modified) (1 diff)
• src/VBox/VMM/VMM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/FTMAll.cpp (modified) (1 diff)

trunk/include/VBox/ftm.h

@@ -58 +58 @@
 VMMR3DECL(int) FTMR3Term(PVM pVM);
 VMMR3DECL(int) FTMR3CancelStandby(PVM pVM);
-VMMR3DECL(int) FTMR3SyncState(PVM pVM);
+VMMR3DECL(int) FTMR3SetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmType);
 
 #endif /* IN_RING3 */

trunk/include/VBox/vmm.h

@@ -105 +105 @@
     /** Ring switch to force preemption. */
     VMMCALLRING3_VM_R0_PREEMPT,
+    /** Sync the FTM state with the standby node. */
+    VMMCALLRING3_FTM_SET_CHECKPOINT,
     /** The usual 32-bit hack. */
     VMMCALLRING3_32BIT_HACK = 0x7fffffff

trunk/src/VBox/VMM/FTM.cpp

@@ -1066 +1066 @@
  *
  * @param   pVM         The VM to operate on.
- */
-VMMR3DECL(int) FTMR3SyncState(PVM pVM)
-{
-    VM_ASSERT_OTHER_THREAD(pVM);
-
+ * @param   enmType     Checkpoint type
+ */
+VMMR3DECL(int) FTMR3SetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmType)
+{
     if (!pVM->fFaultTolerantMaster)
         return VINF_SUCCESS;

trunk/src/VBox/VMM/VMM.cpp

@@ -74 +74 @@
 #include "VMMSwitcher/VMMSwitcher.h"
 #include <VBox/vm.h>
+#include <VBox/ftm.h>
 
 #include <VBox/err.h>
@@ -2147 +2148 @@
             break;
 
+        case VMMCALLRING3_FTM_SET_CHECKPOINT:
+            pVCpu->vmm.s.rcCallRing3 = FTMR3SetCheckpoint(pVM, (FTMCHECKPOINTTYPE)pVCpu->vmm.s.u64CallRing3Arg);
+            break;
+
         default:
             AssertMsgFailed(("enmCallRing3Operation=%d\n", pVCpu->vmm.s.enmCallRing3Operation));

trunk/src/VBox/VMM/VMMAll/FTMAll.cpp

@@ -45 +45 @@
 
 #ifdef IN_RING3
-    return FTMR3SyncState(pVM);
+    return FTMR3SetCheckpoint(pVM, enmType);
 #else
-    return VERR_NOT_IMPLEMENTED;
+    return VMMRZCallRing3(pVM, VMMGetCpu(pVM), VMMCALLRING3_FTM_SET_CHECKPOINT, enmType);
 #endif
 }