Changeset 32199 in vbox for trunk/src/VBox/VMM/FTM.cpp

Timestamp:

Sep 2, 2010 1:42:03 PM (14 years ago)

Author:

vboxsync

Message:

FT: allow memory sync interruption

File:

• trunk/src/VBox/VMM/FTM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -676 +676 @@
     }
     pVM->ftm.s.StatSentMem.c += Hdr.cb + sizeof(Hdr);
-    return VINF_SUCCESS;
+    return (pVM->ftm.s.fCheckpointingActive) ? VERR_INTERRUPTED : VINF_SUCCESS;
 }
 
@@ -763 +763 @@
             /* sync the changed memory with the standby node. */
             /* Write protect all memory. */
-            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)ftmR3WriteProtectMemory, 1, pVM);
-            AssertRC(rc);
+            if (!pVM->ftm.s.fCheckpointingActive)
+            {
+                rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)ftmR3WriteProtectMemory, 1, pVM);
+                AssertRC(rc);
+            }
 
             /* Enumerate all dirty pages and send them to the standby VM. */
-            rc = PGMR3PhysEnumDirtyFTPages(pVM, ftmR3SyncDirtyPage, NULL /* pvUser */);
-            AssertRC(rc);
+            if (!pVM->ftm.s.fCheckpointingActive)
+            {
+                rc = PGMR3PhysEnumDirtyFTPages(pVM, ftmR3SyncDirtyPage, NULL /* pvUser */);
+                Assert(rc == VINF_SUCCESS || rc == VERR_INTERRUPTED);
+            }
 
             /* Send last memory header to signal the end. */