Changeset 60401 in vbox for trunk

Timestamp:

Apr 9, 2016 11:10:40 PM (9 years ago)

Author:

vboxsync

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

106487

Message:

PGM: Converted NO_RAM_RESET into a CFGM option (PGM/ZeroRamPagesOnReset).

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PGM.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (5 diffs)
• VMMR3/PGMSavedState.cpp (modified) (1 diff)
• include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -1363 +1363 @@
 
     rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "PageFusionAllowed", &pVM->pgm.s.fPageFusionAllowed, false);
+    AssertLogRelRCReturn(rc, rc);
+
+    /** @cfgm{/PGM/ZeroRamPagesOnReset, boolean, true}
+     * Whether to clear RAM pages on (hard) reset. */
+    rc = CFGMR3QueryBoolDef(pCfgPGM, "ZeroRamPagesOnReset", &pVM->pgm.s.fZeroRamPagesOnReset, true);
     AssertLogRelRCReturn(rc, rc);
 

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -1948 +1948 @@
         AssertMsg(((RTGCPHYS)iPage << PAGE_SHIFT) == pRam->cb, ("%RGp %RGp\n", (RTGCPHYS)iPage << PAGE_SHIFT, pRam->cb));
 
-#ifndef NO_RAM_RESET
-        if (!pVM->pgm.s.fRamPreAlloc)
-#else
-        if (0)
-#endif
+        if (   !pVM->pgm.s.fRamPreAlloc
+            && pVM->pgm.s.fZeroRamPagesOnReset)
         {
             /* Replace all RAM pages by ZERO pages. */
@@ -2025 +2022 @@
 
                             case PGM_PAGE_STATE_ALLOCATED:
-                            {
-                                void *pvPage;
-                                rc = pgmPhysPageMap(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), &pvPage);
-                                AssertLogRelRCReturn(rc, rc);
-#ifndef NO_RAM_RESET
-                                ASMMemZeroPage(pvPage);
-#endif
+                                if (pVM->pgm.s.fZeroRamPagesOnReset)
+                                {
+                                    void *pvPage;
+                                    rc = pgmPhysPageMap(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), &pvPage);
+                                    AssertLogRelRCReturn(rc, rc);
+                                    ASMMemZeroPage(pvPage);
+                                }
                                 break;
-                            }
                         }
                         break;
@@ -3577 +3573 @@
          */
 #ifndef VBOX_STRICT
-        if (pVM->pgm.s.fRestoreRomPagesAtReset)
+        if (pVM->pgm.s.fRestoreRomPagesOnReset)
 #endif
         {
@@ -3593 +3589 @@
                 if (memcmp(pvDstPage, pbSrcPage, RT_MIN(cbSrcLeft, PAGE_SIZE)))
                 {
-                    if (pVM->pgm.s.fRestoreRomPagesAtReset)
+                    if (pVM->pgm.s.fRestoreRomPagesOnReset)
                     {
                         void *pvDstPageW;
@@ -3613 +3609 @@
     /* Clear the ROM restore flag now as we only need to do this once after
        loading saved state. */
-    pVM->pgm.s.fRestoreRomPagesAtReset = false;
+    pVM->pgm.s.fRestoreRomPagesOnReset = false;
 
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp

@@ -3301 +3301 @@
 static DECLCALLBACK(int) pgmR3LoadDone(PVM pVM, PSSMHANDLE pSSM)
 {
-    pVM->pgm.s.fRestoreRomPagesAtReset = true;
+    pVM->pgm.s.fRestoreRomPagesOnReset = true;
     NOREF(pSSM);
     return VINF_SUCCESS;

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3249 +3249 @@
      * enables the VM to start using an updated ROM without requiring powering
      * down the VM, just rebooting or resetting it. */
-    bool                            fRestoreRomPagesAtReset;
+    bool                            fRestoreRomPagesOnReset;
+    /** Whether to automatically clear all RAM pages on reset. */
+    bool                            fZeroRamPagesOnReset;
+    /** Alignment padding. */
+    bool                            afAlignment3[7];
 
     /** Indicates that PGMR3FinalizeMappings has been called and that further