Changeset 18617 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Apr 1, 2009 10:11:29 PM (16 years ago)

Author:

vboxsync

Message:

PGM,EM: Handle out of memory situations more gracefully - part 1. New debugger commands: .pgmerror and .pgmerroroff.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -75 +75 @@
  *
  * @returns VBox status code (appropriate for trap handling and GC return).
+ *
  * @param   pVM         VM Handle.
  * @param   uErr        The trap error code.
@@ -764 +765 @@
                             return rc;
                         }
+                        if (RT_UNLIKELY(VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)))
+                            return VINF_EM_NO_MEMORY;
                     }
                     /// @todo count the above case; else
@@ -1715 +1718 @@
 # ifdef PGM_SYNC_N_PAGES
                     Assert(cPages == 1 || !(uErr & X86_TRAP_PF_P));
-                    if (cPages > 1 && !(uErr & X86_TRAP_PF_P))
+                    if (    cPages > 1
+                        &&  !(uErr & X86_TRAP_PF_P)
+                        &&  !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
                     {
                         /*
@@ -1953 +1958 @@
 
     Assert(cPages == 1 || !(uErr & X86_TRAP_PF_P));
-    if (cPages > 1 && !(uErr & X86_TRAP_PF_P))
+    if (    cPages > 1
+        &&  !(uErr & X86_TRAP_PF_P)
+        &&  !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
     {
         /*
@@ -1993 +2000 @@
                       (uint64_t)pPTDst->a[iPTDst].u,
                       pPTDst->a[iPTDst].u & PGM_PTFLAGS_TRACK_DIRTY ? " Track-Dirty" : ""));
+
+                if (RT_UNLIKELY(VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY)))
+                    break;
             }
             else
@@ -2677 +2687 @@
             PPGMRAMRANGE    pRam   = pVM->pgm.s.CTX_SUFF(pRamRanges);
             unsigned        iPTDst = 0;
-            while (iPTDst < RT_ELEMENTS(pPTDst->a))
+            while (     iPTDst < RT_ELEMENTS(pPTDst->a)
+                   &&   !VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
             {
                 /* Advance ram range list. */
@@ -2700 +2711 @@
                             rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
                             AssertRCReturn(rc, rc);
+                            if (VM_FF_ISPENDING(pVM, VM_FF_PGM_NO_MEMORY))
+                                break;
                         }
 #  endif