Changeset 30948 in vbox

Timestamp:

Jul 21, 2010 11:27:40 AM (15 years ago)

Author:

vboxsync

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

63836

Message:

PGMSavedState: Apply zero page detection to teleportation as well as normal saving. Avoid goto and corrected the comment.

File:

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

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -1596 +1596 @@
                         if (RT_SUCCESS(rc))
                         {
-                            /* Skip allocated pages that are zero. */
-                            if (    !fLiveSave
-                                &&  ASMMemIsZeroPage(pvPage))
-                            {
-                                fZero = true;
-                                goto save_zero_page;
-                            }
-
                             memcpy(abPage, pvPage, PAGE_SIZE);
 #ifdef PGMLIVESAVERAMPAGE_WITH_CRC32
@@ -1613 +1605 @@
                         AssertLogRelMsgRCReturn(rc, ("rc=%Rrc GCPhys=%RGp\n", rc, GCPhys), rc);
 
-                        if (GCPhys == GCPhysLast + PAGE_SIZE)
-                            SSMR3PutU8(pSSM, PGM_STATE_REC_RAM_RAW);
+                        /* Try save some memory when restoring. */
+                        if (!ASMMemIsZeroPage(pvPage))
+                        {
+                            if (GCPhys == GCPhysLast + PAGE_SIZE)
+                                SSMR3PutU8(pSSM, PGM_STATE_REC_RAM_RAW);
+                            else
+                            {
+                                SSMR3PutU8(pSSM, PGM_STATE_REC_RAM_RAW | PGM_STATE_REC_FLAG_ADDR);
+                                SSMR3PutGCPhys(pSSM, GCPhys);
+                            }
+                            rc = SSMR3PutMem(pSSM, abPage, PAGE_SIZE);
+                        }
                         else
                         {
-                            SSMR3PutU8(pSSM, PGM_STATE_REC_RAM_RAW | PGM_STATE_REC_FLAG_ADDR);
-                            SSMR3PutGCPhys(pSSM, GCPhys);
+                            if (GCPhys == GCPhysLast + PAGE_SIZE)
+                                rc = SSMR3PutU8(pSSM, PGM_STATE_REC_RAM_ZERO);
+                            else
+                            {
+                                SSMR3PutU8(pSSM, PGM_STATE_REC_RAM_ZERO | PGM_STATE_REC_FLAG_ADDR);
+                                rc = SSMR3PutGCPhys(pSSM, GCPhys);
+                            }
                         }
-                        rc = SSMR3PutMem(pSSM, abPage, PAGE_SIZE);
                     }
                     else
                     {
-save_zero_page:
                         /*
                          * Dirty zero page.
@@ -2601 +2606 @@
                             ||  PGM_PAGE_IS_BALLOONED(pPage))
                             break;
-                        AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_INTERNAL_ERROR_5); 
+                        AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_INTERNAL_ERROR_5);
                         /* Allocated before (prealloc), so free it now. */
                         rc = pgmPhysFreePage(pVM, pReq, &cPendingPages, pPage, GCPhys);