Changeset 32155 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 31, 2010 3:25:26 PM (15 years ago)

Author:

vboxsync

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

65432

Message:

FT updates

File:

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

trunk/src/VBox/VMM/FTM.cpp

@@ -629 +629 @@
         AssertRC(rc);
 
+        /* Reset the sync state. */
+        pVM->ftm.s.syncstate.uOffStream   = 0;
+        pVM->ftm.s.syncstate.cbReadBlock  = 0;
+        pVM->ftm.s.syncstate.fStopReading = false;
+        pVM->ftm.s.syncstate.fIOError     = false;
+        pVM->ftm.s.syncstate.fEndOfStream = false;
+
         pVM->ftm.s.fDeltaLoadSaveActive = (fFullSync == false);
         rc = VMR3Save(pVM, NULL /* pszFilename */, &g_ftmR3TcpOps, pVM, true /* fContinueAfterwards */, NULL, NULL, &fSuspended);
@@ -934 +941 @@
 
             RTSocketRetain(pVM->ftm.s.hSocket); /* For concurrent access by I/O thread and EMT. */
-            pVM->ftm.s.syncstate.uOffStream = 0;
+
+            /* Reset the sync state. */
+            pVM->ftm.s.syncstate.uOffStream   = 0;
+            pVM->ftm.s.syncstate.cbReadBlock  = 0;
+            pVM->ftm.s.syncstate.fStopReading = false;
+            pVM->ftm.s.syncstate.fIOError     = false;
+            pVM->ftm.s.syncstate.fEndOfStream = false;
 
             pVM->ftm.s.fDeltaLoadSaveActive = (fFullSync == false);
@@ -1116 +1129 @@
     AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));
 
-    /* Reset the sync state. */
-    pVM->ftm.s.syncstate.uOffStream   = 0;
-    pVM->ftm.s.syncstate.cbReadBlock  = 0;
-    pVM->ftm.s.syncstate.fStopReading = false;
-    pVM->ftm.s.syncstate.fIOError     = false;
-    pVM->ftm.s.syncstate.fEndOfStream = false;
-
     /* Sync state + changed memory with the standby node. */
     rc = ftmR3PerformSync(pVM, FTMSYNCSTATE_DELTA_VM);