Changeset 91018 in vbox

Timestamp:

Aug 31, 2021 1:30:41 AM (4 years ago)

Author:

vboxsync

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

146658

Message:

VMM/MM: Removed the MMR3UkHeap* code as nobody is using it any more. bugref:9627

Location:

trunk

Files:

trunk/include/VBox/vmm/mm.h

-              r90991
+              r91018
 /** @} */
-/** @defgroup grp_mm_ukheap   User-kernel Heap Manager.
+ *
- * The memory is safely accessible from kernel context as well as user land.
+ *
- * @{ */
-VMMR3DECL(void *)   MMR3UkHeapAlloc(PVM pVM, MMTAG enmTag, size_t cbSize, PRTR0PTR pR0Ptr);
-VMMR3DECL(int)      MMR3UkHeapAllocEx(PVM pVM, MMTAG enmTag, size_t cbSize, void **ppv, PRTR0PTR pR0Ptr);
-VMMR3DECL(void *)   MMR3UkHeapAllocZ(PVM pVM, MMTAG enmTag, size_t cbSize, PRTR0PTR pR0Ptr);
-VMMR3DECL(int)      MMR3UkHeapAllocZEx(PVM pVM, MMTAG enmTag, size_t cbSize, void **ppv, PRTR0PTR pR0Ptr);
-VMMR3DECL(void)     MMR3UkHeapFree(PVM pVM, void *pv, MMTAG enmTag);
-/** @} */
 /** @} */
 #endif /* IN_RING3 || DOXYGEN_RUNNING */

-              r82968
+              r91018
     int rc = mmR3HeapCreateU(pUVM, &pUVM->mm.s.pHeap);
     if (RT_SUCCESS(rc))
+    {
+        rc = mmR3UkHeapCreateU(pUVM, &pUVM->mm.s.pUkHeap);
+        if (RT_SUCCESS(rc))
+            return VINF_SUCCESS;
+        mmR3HeapDestroy(pUVM->mm.s.pHeap);
+        pUVM->mm.s.pHeap = NULL;
+    }
+        return VINF_SUCCESS;
     return rc;
+}
 …
     pVM->mm.s.offVM          = 0;           /* init assertion on this */
-    /*
-     * Destroy the User-kernel heap here since the support driver session
-     * may have been terminated by the time we get to MMR3TermUVM.
-     */
-    mmR3UkHeapDestroy(pVM->pUVM->mm.s.pUkHeap);
-    pVM->pUVM->mm.s.pUkHeap = NULL;
     return VINF_SUCCESS;
+}
 …
+{
     /*
+     * Destroy the heaps.
+     */
+    if (pUVM->mm.s.pUkHeap)
+    {
+        mmR3UkHeapDestroy(pUVM->mm.s.pUkHeap);
+        pUVM->mm.s.pUkHeap = NULL;
+    }
+     * Destroy the heap.
+     */
     mmR3HeapDestroy(pUVM->mm.s.pHeap);
     pUVM->mm.s.pHeap = NULL;

-              r82968
+              r91018
     /** Pointer to the MM R3 Heap. */
     R3PTRTYPE(PMMHEAP)          pHeap;
-    /** Pointer to the MM Uk Heap. */
-    R3PTRTYPE(PMMUKHEAP)        pUkHeap;
 } MMUSERPERVM;
 /** Pointer to the MM data kept in the UVM. */
 …
 RT_C_DECLS_BEGIN
 int  mmR3UpdateReservation(PVM pVM);
 int  mmR3HeapCreateU(PUVM pUVM, PMMHEAP *ppHeap);
 void mmR3HeapDestroy(PMMHEAP pHeap);
-void mmR3UkHeapDestroy(PMMUKHEAP pHeap);
-int  mmR3UkHeapCreateU(PUVM pUVM, PMMUKHEAP *ppHeap);
 int  mmR3HyperInit(PVM pVM);

Note: See TracChangeset for help on using the changeset viewer.