Changeset 1468 in vbox

Timestamp:

Mar 14, 2007 12:26:51 PM (18 years ago)

Author:

vboxsync

Message:

Error details for when we can't get contiguous or low memory.

Location:

trunk/src/VBox/VMM

Files:

• MMPagePool.cpp (modified) (1 diff)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MMPagePool.cpp

@@ -314 +314 @@
     MMR3HeapFree(pSub);
     STAM_COUNTER_INC(&pPool->cErrors);
-    AssertMsgFailed(("Failed to expand pool%s. rc=%d poolsize=%d\n",
-                     pPool->fLow ? " (<4GB)" : "", pPool->cPages));
+    if (pPool->fLow)
+        VMSetError(pPool->pVM, rc, RT_SRC_POS,
+                   N_("Failed to expand page pool for memory below 4GB. current size: %d pages\n"), 
+                   pPool->cPages);
+    AssertMsgFailed(("Failed to expand pool%s. rc=%Vrc poolsize=%d\n",
+                     pPool->fLow ? " (<4GB)" : "", rc, pPool->cPages));
     return NULL;
 }

trunk/src/VBox/VMM/VM.cpp

@@ -271 +271 @@
         else
         {
-            AssertMsgFailed(("Failed to allocate %d bytes of contiguous memory\n", RT_ALIGN(sizeof(*pVM), PAGE_SIZE)));
             rc = VERR_NO_MEMORY;
+            vmR3CallVMAtError(pfnVMAtError, pvUserVM, rc, RT_SRC_POS, 
+                              N_("Failed to allocate %d bytes of contiguous memory for the VM structure!\n"), 
+                              RT_ALIGN(sizeof(*pVM), PAGE_SIZE));
+            AssertMsgFailed(("Failed to allocate %d bytes of contiguous memory for the VM structure!\n", RT_ALIGN(sizeof(*pVM), PAGE_SIZE)));
         }