Changeset 24918 in vbox for trunk/src

Timestamp:

Nov 24, 2009 4:16:49 PM (15 years ago)

Author:

vboxsync

Message:

VM,PGM: Fixed handling of VM reset during teleporation / live save.

Location:

trunk/src/VBox/VMM

Files:

• PGMPhys.cpp (modified) (2 diffs)
• VM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1142 +1142 @@
 {
     Assert(PGMIsLockOwner(pVM));
-    /*
-     * We batch up pages before freeing them.
+
+    /*
+     * We batch up pages that should be freed instead of calling GMM for
+     * each and every one of them.
      */
     uint32_t            cPendingPages = 0;
@@ -3225 +3227 @@
     pVM->pgm.s.cZeroPages++;
 
+    /* Deal with write monitored pages. */
+    if (PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_WRITE_MONITORED)
+    {
+        PGM_PAGE_SET_WRITTEN_TO(pPage);
+        pVM->pgm.s.cWrittenToPages++;
+    }
+
     /*
      * pPage = ZERO page.

trunk/src/VBox/VMM/VM.cpp

@@ -1502 +1502 @@
  * @param   pVM             The VM handle.
  * @param   pVCpu           The VMCPU handle of the EMT.
- * @param   pvUser          Ignored.
+ * @param   pvUser          The pfSuspended argument of vmR3SaveTeleport.
  */
 static DECLCALLBACK(VBOXSTRICTRC) vmR3LiveDoStep1Cleanup(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
     LogFlow(("vmR3LiveDoStep1Cleanup: pVM=%p pVCpu=%p/#%u\n", pVM, pVCpu, pVCpu->idCpu));
-    NOREF(pvUser); NOREF(pVCpu);
+    bool *pfSuspended = (bool *)pvUser;
+    NOREF(pVCpu);
 
     int rc = vmR3TrySetState(pVM, "vmR3LiveDoStep1Cleanup", 6,
-                             VMSTATE_OFF,               VMSTATE_OFF_LS,
-                             VMSTATE_FATAL_ERROR,       VMSTATE_FATAL_ERROR_LS,
-                             VMSTATE_GURU_MEDITATION,   VMSTATE_GURU_MEDITATION_LS,
+                             VMSTATE_OFF,               VMSTATE_OFF_LS,                     /* 1 */
+                             VMSTATE_FATAL_ERROR,       VMSTATE_FATAL_ERROR_LS,             /* 2 */
+                             VMSTATE_GURU_MEDITATION,   VMSTATE_GURU_MEDITATION_LS,         /* 3 */
+                             VMSTATE_SUSPENDED,         VMSTATE_SUSPENDED_LS,               /* 4 */
+                             VMSTATE_SUSPENDED,         VMSTATE_SUSPENDED_EXT_LS,
                              VMSTATE_RUNNING,           VMSTATE_RUNNING_LS,
-                             VMSTATE_SUSPENDED,         VMSTATE_SUSPENDED_EXT_LS,
                              VMSTATE_DEBUGGING,         VMSTATE_DEBUGGING_LS);
     if (rc == 1)
@@ -1522 +1524 @@
     else if (rc == 3)
         rc = VERR_SSM_LIVE_GURU_MEDITATION;
+    else if (rc == 4)
+    {
+        *pfSuspended = true;
+        rc = VINF_SUCCESS;
+    }
     else if (rc > 0)
         rc = VINF_SUCCESS;
@@ -1705 +1712 @@
             AssertMsg(rc2 == rc, ("%Rrc != %Rrc\n", rc2, rc));
 
-            rc2 = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, vmR3LiveDoStep1Cleanup, NULL);
+            rc2 = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, vmR3LiveDoStep1Cleanup, pfSuspended);
             if (RT_FAILURE(rc2) && rc == VERR_SSM_CANCELLED)
                 rc = rc2;