Changeset 33192 in vbox for trunk/src/VBox/VMM/MMHyper.cpp

Timestamp:

Oct 18, 2010 11:54:33 AM (14 years ago)

Author:

vboxsync

Message:

Need more space for the hypervisor heap for large memory guests

File:

• trunk/src/VBox/VMM/MMHyper.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -45 +45 @@
 
 
-DECLINLINE(uint32_t) computeHyperHeapSize(bool fCanUseLargerHeap, uint32_t cCpus, bool fHwVirtExtForced)
-{
-    if (cCpus > 1)
-        return _2M + cCpus * _64K;
+DECLINLINE(uint32_t) mmR3ComputeHyperHeapSize(PVM pVM, bool fCanUseLargerHeap)
+{
+    bool fHwVirtExtForced = VMMIsHwVirtExtForced(pVM);
+
+    if (pVM->cCpus > 1)
+        return _1M + pVM->cCpus * 2 * _64K;
 
     if (fCanUseLargerHeap)
         return 1280*_1K;
     else
-        /* Size must be kept like this for saved state compatibility */
-        return fHwVirtExtForced ? 640*_1K : 1280*_1K;
+    if (fHwVirtExtForced)
+    {
+        /* Need a bit more space for large memory guests. */
+        if (pVM->mm.s.cbRamBase >= _4G)
+            return _1M;
+        else
+            return 640 * _1K;
+    }
+    else
+        /* Size must be kept like this for saved state compatibility (only for raw mode though). */
+        return 1280*_1K;
 }
 
@@ -87 +98 @@
     bool fCanUseLargerHeap = false;
     int rc = CFGMR3QueryBoolDef(pMM, "CanUseLargerHeap", &fCanUseLargerHeap, false);
-    uint32_t cbHyperHeap = computeHyperHeapSize(fCanUseLargerHeap, pVM->cCpus, VMMIsHwVirtExtForced(pVM));
+    uint32_t cbHyperHeap = mmR3ComputeHyperHeapSize(pVM, fCanUseLargerHeap);
     rc = CFGMR3QueryU32Def(pMM, "cbHyperHeap", &cbHyperHeap, cbHyperHeap);
     AssertLogRelRCReturn(rc, rc);