Changeset 39745 in vbox

Timestamp:

Jan 10, 2012 6:23:43 PM (13 years ago)

Author:

vboxsync

Message:

Check some more out of memory statuses.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/GMMR0.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (2 diffs)
• VMMRZ/PGMRZDynMap.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -2505 +2505 @@
 
                 /* If the host is out of memory, take whatever we can get. */
-                if (   rc == VERR_NO_MEMORY
+                if (   (rc == VERR_NO_MEMORY || rc == VERR_NO_PHYS_MEMORY)
                     && pGMM->PrivateX.cFreePages + pGMM->Shared.cFreePages >= cPages - iPage)
                 {

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

@@ -4344 +4344 @@
         }
 
-        if (    rc != VERR_NO_MEMORY
-            &&  rc != VERR_LOCK_FAILED)
+        if (   rc != VERR_NO_MEMORY
+            && rc != VERR_NO_PHYS_MEMORY
+            && rc != VERR_LOCK_FAILED)
         {
             for (uint32_t i = 0; i < RT_ELEMENTS(pVM->pgm.s.aHandyPages); i++)
@@ -4373 +4374 @@
         VM_FF_SET(pVM, VM_FF_PGM_NO_MEMORY);
         if (    rc == VERR_NO_MEMORY
+            ||  rc == VERR_NO_PHYS_MEMORY
             ||  rc == VERR_LOCK_FAILED)
             rc = VINF_EM_NO_MEMORY;

trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp

@@ -1062 +1062 @@
         pSeg->hMemObj = NIL_RTR0MEMOBJ;
     }
+    else if (rc == VERR_NO_PAGE_MEMORY || rc == VERR_NO_PHYS_MEMORY)
+        rc = VERR_NO_MEMORY;
     RTMemFree(pSeg);