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

Timestamp:

Apr 7, 2009 12:21:17 PM (16 years ago)

Author:

vboxsync

Message:

PGMPhys.cpp,MMHyper.cpp: The MMR3UkHeap bits seems to be working and we're not running out of heap as the guest uses more and more of the memory. Removed the old disabled code.

Location:

trunk/src/VBox/VMM

Files:

• MMHyper.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -78 +78 @@
     int rc = CFGMR3QueryU32(CFGMR3GetChild(CFGMR3GetRoot(pVM), "MM"), "cbHyperHeap", &cbHyperHeap);
     if (rc == VERR_CFGM_NO_PARENT || rc == VERR_CFGM_VALUE_NOT_FOUND)
-    {
         cbHyperHeap = VMMIsHwVirtExtForced(pVM)
                     ? 640*_1K
                     : 1280*_1K;
-
-        /* Adjust for dynamic stuff like RAM mapping chunks. Try playing kind
-           of safe with existing configs here (HMA size must not change)... */
-        uint64_t cbRam;
-        CFGMR3QueryU64Def(CFGMR3GetRoot(pVM), "RamSize", &cbRam, 0);
-#if 0 /* MMUkHeap takes care of this now...*/
-        if (cbRam > _2G)
-        {
-            cbRam = RT_MIN(cbRam, _1T);
-            cbHyperHeap += (cbRam - _1G) / _1M * 128; /* 128 is a quick guess */
-            cbHyperHeap = RT_ALIGN_32(cbHyperHeap, _64K);
-        }
-#endif
-    }
     else
         AssertLogRelRCReturn(rc, rc);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -2785 +2785 @@
      * Allocate a new tracking structure first.
      */
-#if 1 /* disable on regression */
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
     PPGMCHUNKR3MAP pChunk = (PPGMCHUNKR3MAP)MMR3HeapAlloc(pVM, MM_TAG_PGM_CHUNK_MAPPING, sizeof(*pChunk));
@@ -2792 +2791 @@
 # endif
     AssertReturn(pChunk, VERR_NO_MEMORY);
-#else
-    PPGMCHUNKR3MAP pChunk;
-    rc = MMHyperAlloc(pVM, sizeof(*pChunk), 0, MM_TAG_PGM_CHUNK_MAPPING, (void **)&pChunk);
-    AssertRCReturn(rc, rc);
-#endif
     pChunk->Core.Key = idChunk;
     pChunk->AgeCore.Key = pVM->pgm.s.ChunkR3Map.iNow;