Changeset 6816 in vbox

Timestamp:

Feb 5, 2008 9:50:07 PM (17 years ago)

Author:

vboxsync

Message:

Made MMR3HyperAllocOnceNoRel suitable for allocating the PGMRAMRANGE structures.

File:

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

trunk/src/VBox/VMM/MMHyper.cpp

@@ -745 +745 @@
 {
     AssertMsg(cb >= 8, ("Hey! Do you really mean to allocate less than 8 bytes?! cb=%d\n", cb));
-    AssertMsg(cb <= _4M, ("Allocating more than 4MB!? (cb=%#x) HMA limit might need adjusting if you allocate more.\n", cb));
 
     /*
@@ -759 +758 @@
             ||  cb <= 8*_1K)
         {
-            Log2(("MMR3HyperAllocOnceNoRel: cb=%#x uAlignment=%#x returns %Rrc and *ppv=%p\n",
+            Log2(("MMR3HyperAllocOnceNoRel: cb=%#zx uAlignment=%#x returns %Rrc and *ppv=%p\n",
                   cb, uAlignment, rc, *ppv));
             return rc;
@@ -798 +797 @@
             return rc;
         }
+        AssertMsgFailed(("Failed to allocate %zd bytes! %Rrc\n", cb, rc));
         SUPPageFree(pvPages, cb >> PAGE_SHIFT);
-    }
+
+        /*
+         * HACK ALERT! Try allocate it off the heap so that we don't freak
+         * out during vga/vmmdev mmio2 allocation with certain ram sizes.
+         */
+        /** @todo make a proper fix for this so we will never end up in this kind of situation! */
+        Log(("MMR3HyperAllocOnceNoRel: MMR3HyperMapHCRam failed with rc=%Rrc, try MMHyperAlloc(,%#d,,) instead\n",  rc, cb));
+        int rc2 = MMHyperAlloc(pVM, cb, uAlignment, enmTag, ppv);
+        if (RT_SUCCESS(rc2))
+        {
+            Log2(("MMR3HyperAllocOnceNoRel: cb=%#x uAlignment=%#x returns %Rrc and *ppv=%p\n",
+                  cb, uAlignment, rc, *ppv));
+            return rc;
+        }
+    }
+    else
+        AssertMsgFailed(("Failed to allocate %zd bytes! %Rrc\n", cb, rc));
+
     if (rc == VERR_NO_MEMORY)
         rc = VERR_MM_HYPER_NO_MEMORY;
-    Log2(("MMR3HyperAllocOnceNoRel: cb=%#x uAlignment=%#x returns %Rrc\n", cb, uAlignment, rc));
-    AssertMsgFailed(("Failed to allocate %d bytes!\n", cb));
+    LogRel(("MMR3HyperAllocOnceNoRel: cb=%#zx uAlignment=%#x returns %Rrc\n", cb, uAlignment, rc));
     return rc;
 }