Changeset 20866 in vbox

Timestamp:

Jun 23, 2009 7:33:23 PM (15 years ago)

Author:

vboxsync

Message:

SUP: Removed two obsolete allocation APIs.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• src/VBox/VMM/MMInternal.h (modified) (1 diff)
• src/VBox/VMM/MMPagePool.cpp (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -701 +701 @@
  * Use SUPR3PageFreeEx() to free memory allocated with this function.
  *
- * This SUPR3PageAllocEx and SUPR3PageFreeEx replaces SUPR3PageAllocLockedEx,
- * SUPR3PageFreeLocked, SUPR3PageAlloc, and SUPR3PageFree.
- *
  * @returns VBox status code.
  * @param   cPages          The number of pages to allocate.
@@ -759 +756 @@
  */
 SUPR3DECL(int) SUPR3PageFreeEx(void *pvPages, size_t cPages);
-
-/**
- * Allocate non-zeroed locked pages.
- *
- * @returns VBox status code.
- * @param   cPages          Number of pages to allocate.
- * @param   ppvPages        Where to store the base pointer to the allocated pages.
- * @param   paPages         Where to store the physical page addresses returned.
- *                          On entry this will point to an array of with cbMemory >> PAGE_SHIFT entries.
- *                          NULL is allowed.
- * @todo remove this.
- */
-SUPR3DECL(int) SUPR3PageAllocLockedEx(size_t cPages, void **ppvPages, PSUPPAGE paPages);
-
-/**
- * Frees locked pages allocated with SUPPageAllocLockedEx().
- *
- * @returns VBox status.
- * @param   pvPages         Pointer returned by SUPR3PageAllocLockedEx().
- * @param   cPages          Number of pages that was allocated.
- * @todo remove this.
- */
-SUPR3DECL(int) SUPR3PageFreeLocked(void *pvPages, size_t cPages);
 
 /**

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -968 +968 @@
 
 
-SUPR3DECL(int) SUPR3PageAllocLockedEx(size_t cPages, void **ppvPages, PSUPPAGE paPages)
-{
-    return SUPR3PageAllocEx(cPages, 0 /*fFlags*/, ppvPages, NULL /*pR0Ptr*/, paPages);
-}
-
-
-SUPR3DECL(int) SUPR3PageFreeLocked(void *pvPages, size_t cPages)
-{
-    /*
-     * Validate.
-     */
-    AssertPtrReturn(pvPages, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
-
-    /*
-     * Check if we're employing the fallback or not to avoid the
-     * fuzzy handling of this in SUPR3PageFreeEx.
-     */
-    int rc;
-    if (g_fSupportsPageAllocNoKernel)
-        rc = SUPR3PageFreeEx(pvPages, cPages);
-    else
-    {
-        /* fallback */
-        rc = supR3PageUnlock(pvPages);
-        if (RT_SUCCESS(rc))
-            rc = suplibOsPageFree(&g_supLibData, pvPages, cPages);
-    }
-    return rc;
-}
-
-
 /**
- * Fallback for SUPR3PageAllocLockedEx on systems where RTR0MemObjPhysAllocNC
- * isn't supported.
+ * Fallback for SUPR3PageAllocEx on systems where RTR0MemObjPhysAllocNC isn't
+ * supported.
  */
 static int supPagePageAllocNoKernelFallback(size_t cPages, void **ppvPages, PSUPPAGE paPages)

trunk/src/VBox/VMM/MMInternal.h

@@ -527 +527 @@
     /** Flag indicating the allocation method.
      * Set: SUPR3LowAlloc().
-     * Clear: SUPR3PageAllocLockedEx(). */
+     * Clear: SUPR3PageAllocEx(). */
     bool                                fLow;
     /** Number of subpools. */

trunk/src/VBox/VMM/MMPagePool.cpp

@@ -68 +68 @@
      *        ring-0. Need to change the wasy we allocate it... */
     AssertReleaseReturn(sizeof(*pVM->mm.s.pPagePoolR3) + sizeof(*pVM->mm.s.pPagePoolLowR3) < PAGE_SIZE, VERR_INTERNAL_ERROR);
-    int rc = SUPR3PageAllocLockedEx(1, (void **)&pVM->mm.s.pPagePoolR3, NULL);
+    int rc = SUPR3PageAllocEx(1, 0 /*fFlags*/, (void **)&pVM->mm.s.pPagePoolR3, NULL /*pR0Ptr*/, NULL /*paPages*/);
     if (RT_FAILURE(rc))
         return rc;