Changeset 37805 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 6, 2011 3:00:19 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72684

Message:

GMMR0: cleanup

File:

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

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

@@ -2543 +2543 @@
             else
                 AssertMsgFailed(("idPage=%#x\n", idPage));
+
             paPages[iPage].idPage       = NIL_GMM_PAGEID;
             paPages[iPage].idSharedPage = NIL_GMM_PAGEID;
@@ -2729 +2730 @@
             if (RT_SUCCESS(rc))
             {
-#if 0  /* This appears to spell trouble... weird. */
+#if defined(VBOX_STRICT) && 0 /** @todo re-test this later. Appeared to be a PGM init bug. */
                 for (iPage = 0; iPage < cPagesToAlloc; iPage++)
                 {
@@ -2742 +2743 @@
                  * Note! gmmR0AllocateMoreChunks may leave the protection of the mutex!
                  */
-#if 0  /* Trying to reproduce out of memory issue... */
-                if (!cPagesToUpdate)
-#endif
-                    rc = gmmR0AllocatePagesNew(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE);
-#if 0  /* Trying to reproduce out of memory issue... */
-                else
-                {
-                    for (iPage = 0; iPage < cPagesToAlloc; iPage++)
-                    {
-                        paPages[iPage].HCPhysGCPhys  = NIL_RTHCPHYS;
-                        paPages[iPage].idPage        = NIL_GMM_PAGEID;
-                        paPages[iPage].idSharedPage  = NIL_GMM_PAGEID;
-                    }
-
-                    rc = VERR_GMM_HIT_VM_ACCOUNT_LIMIT;
-                }
-#endif
+                rc = gmmR0AllocatePagesNew(pGMM, pGVM, cPagesToAlloc, paPages, GMMACCOUNT_BASE);
             }
         }