Changeset 14591 in vbox for trunk/src

Timestamp:

Nov 25, 2008 7:53:49 PM (16 years ago)

Author:

vboxsync

Message:

MMPagePool: SUPPageAlloc/SUPPageLock -> SUPR3PageAllocEx.

File:

• trunk/src/VBox/VMM/MMPagePool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/MMPagePool.cpp

@@ -122 +122 @@
         while (pSubPool)
         {
-            int rc = SUPPageUnlock(pSubPool->pvPages);
-            AssertMsgRC(rc, ("SUPPageUnlock(%p) failed with rc=%d\n", pSubPool->pvPages, rc));
-            rc = SUPPageFree(pSubPool->pvPages, pSubPool->cPages);
-            AssertMsgRC(rc, ("SUPPageFree(%p) failed with rc=%d\n", pSubPool->pvPages, rc));
+            int rc = SUPR3PageFreeEx(pSubPool->pvPages, pSubPool->cPages);
+            AssertMsgRC(rc, ("SUPPageFree(%p) failed with rc=%Rrc\n", pSubPool->pvPages, rc));
             pSubPool->pvPages = NULL;
 
@@ -250 +248 @@
     if (!pPool->fLow)
     {
-        /*
-         * Allocate and lock the pages.
-         */
-        rc = SUPPageAlloc(cPages, &pSub->pvPages);
+        rc = SUPR3PageAllocEx(cPages,
+                              0 /* fFlags */,
+                              &pSub->pvPages,
+                              NULL,
+                              paPhysPages);
         if (RT_SUCCESS(rc))
-        {
-            rc = SUPPageLock(pSub->pvPages, cPages, paPhysPages);
-            if (RT_FAILURE(rc))
-            {
-                SUPPageFree(pSub->pvPages, cPages);
-                rc = VMSetError(pPool->pVM, rc, RT_SRC_POS,
-                                N_("Failed to lock host %zd bytes of memory (out of memory)"), (size_t)cPages << PAGE_SHIFT);
-            }
-        }
+            rc = VMSetError(pPool->pVM, rc, RT_SRC_POS,
+                            N_("Failed to lock host %zd bytes of memory (out of memory)"), (size_t)cPages << PAGE_SHIFT);
     }
     else