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

Timestamp:

Nov 25, 2008 9:04:12 PM (16 years ago)

Author:

vboxsync

Message:

MMHyper: Fixed VM::mm.s.pHyperHeapR0.

File:

• trunk/src/VBox/VMM/MMHyper.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -43 +43 @@
 static DECLCALLBACK(bool) mmR3HyperRelocateCallback(PVM pVM, RTGCPTR GCPtrOld, RTGCPTR GCPtrNew, PGMRELOCATECALL enmMode, void *pvUser);
 static int mmR3HyperMap(PVM pVM, const size_t cb, const char *pszDesc, PRTGCPTR pGCPtr, PMMLOOKUPHYPER *ppLookup);
-static int mmR3HyperHeapCreate(PVM pVM, const size_t cb, PMMHYPERHEAP *ppHeap);
+static int mmR3HyperHeapCreate(PVM pVM, const size_t cb, PMMHYPERHEAP *ppHeap, PRTR0PTR pR0PtrHeap);
 static int mmR3HyperHeapMap(PVM pVM, PMMHYPERHEAP pHeap, PRTGCPTR ppHeapGC);
 static DECLCALLBACK(void) mmR3HyperInfoHma(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
@@ -92 +92 @@
      * hypervisor static area because lookup records are allocated from it.)
      */
-    rc = mmR3HyperHeapCreate(pVM, cbHyperHeap, &pVM->mm.s.pHyperHeapR3);
+    rc = mmR3HyperHeapCreate(pVM, cbHyperHeap, &pVM->mm.s.pHyperHeapR3, &pVM->mm.s.pHyperHeapR0);
     if (RT_SUCCESS(rc))
     {
-        pVM->mm.s.pHyperHeapR0 = (uintptr_t)pVM->mm.s.pHyperHeapR3; /** @todo #1865: map into ring-0 / whatever. */
-
         /*
          * Make a small head fence to fend of accidental sequential access.
@@ -699 +697 @@
  *
  * @returns VBox status code.
- * @param   pVM     The VM handle.
- * @param   cb      The size of the new heap.
- * @param   ppHeap  Where to store the heap pointer on successful return.
- */
-static int mmR3HyperHeapCreate(PVM pVM, const size_t cb, PMMHYPERHEAP *ppHeap)
+ * @param   pVM         The VM handle.
+ * @param   cb          The size of the new heap.
+ * @param   ppHeap      Where to store the heap pointer on successful return.
+ * @param   pR0PtrHeap  Where to store the ring-0 address of the heap on
+ *                      success.
+ */
+static int mmR3HyperHeapCreate(PVM pVM, const size_t cb, PMMHYPERHEAP *ppHeap, PRTR0PTR pR0PtrHeap)
 {
     /*
@@ -758 +758 @@
 
         *ppHeap = pHeap;
+        *pR0PtrHeap = pvR0;
         return VINF_SUCCESS;
     }