Changeset 6796 in vbox for trunk/src/VBox/VMM/MM.cpp

Timestamp:

Feb 4, 2008 6:19:58 PM (17 years ago)

Author:

vboxsync

Message:

Fixed init problems wrt. VM ownership by implementing the UVM structure (U = user mode) and moving problematic ring-3 stuff over there (emt+reqs, r3heap, stam, loader[VMMR0.r0]). Big change, but it works fine here... :-)

File:

• trunk/src/VBox/VMM/MM.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/MM.cpp

@@ -88 +88 @@
 #include "MMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/uvm.h>
 #include <VBox/err.h>
 #include <VBox/param.h>
@@ -107 +108 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int mmR3Term(PVM pVM, bool fKeepTheHeap);
 static DECLCALLBACK(int) mmR3Save(PVM pVM, PSSMHANDLE pSSM);
 static DECLCALLBACK(int) mmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version);
 
+
+/**
+ * Initializes the MM members of the UVM.
+ *
+ * This is currently only the ring-3 heap.
+ *
+ * @returns VBox status code.
+ * @param   pUVM    Pointer to the user mode VM structure.
+ */
+MMR3DECL(int) MMR3InitUVM(PUVM pUVM)
+{
+    /*
+     * Assert sizes and order.
+     */
+    AssertCompile(sizeof(pUVM->mm.s) <= sizeof(pUVM->mm.padding));
+    AssertRelease(sizeof(pUVM->mm.s) <= sizeof(pUVM->mm.padding));
+    Assert(!pUVM->mm.s.pHeap);
+
+    /*
+     * Init the heap.
+     */
+    return mmR3HeapCreateU(pUVM, &pUVM->mm.s.pHeap);
+}
 
 
@@ -147 +170 @@
     pVM->mm.s.offVM = RT_OFFSETOF(VM, mm);
     pVM->mm.s.offLookupHyper = NIL_OFFSET;
-
-    /*
-     * Init the heap (may already be initialized already if someone used it).
-     */
-    if (!pVM->mm.s.pHeap)
-    {
-        int rc = mmR3HeapCreate(pVM, &pVM->mm.s.pHeap);
-        if (!VBOX_SUCCESS(rc))
-            return rc;
-    }
 
     /*
@@ -182 +195 @@
         }
     }
-    mmR3Term(pVM, true /* keep the heap */);
+    MMR3Term(pVM);
     return rc;
 }
@@ -346 +359 @@
  */
 MMR3DECL(int) MMR3Term(PVM pVM)
-{
-    return mmR3Term(pVM, false /* free the heap */);
-}
-
-
-/**
- * Worker for MMR3Term and MMR3Init.
- *
- * The tricky bit here is that we must not destroy the heap if we're
- * called from MMR3Init, otherwise we'll get into trouble when
- * CFGMR3Term is called later in the bailout process.
- *
- * @returns VBox status code.
- * @param   pVM             The VM to operate on.
- * @param   fKeepTheHeap    Whether or not to keep the heap.
- */
-static int mmR3Term(PVM pVM, bool fKeepTheHeap)
 {
     /*
@@ -395 +391 @@
 
     /*
-     * Destroy the heap if requested.
-     */
-    if (!fKeepTheHeap)
-    {
-        mmR3HeapDestroy(pVM->mm.s.pHeap);
-        pVM->mm.s.pHeap = NULL;
-    }
-
-    /*
      * Zero stuff to detect after termination use of the MM interface
      */
@@ -413 +400 @@
 
     return 0;
+}
+
+
+/**
+ * Terminates the UVM part of MM.
+ *
+ * Termination means cleaning up and freeing all resources,
+ * the VM it self is at this point powered off or suspended.
+ *
+ * @returns VBox status code.
+ * @param   pUVM        Pointer to the user mode VM structure.
+ */
+MMR3DECL(void) MMR3TermUVM(PUVM pUVM)
+{
+    /*
+     * Destroy the heap.
+     */
+    mmR3HeapDestroy(pUVM->mm.s.pHeap);
+    pUVM->mm.s.pHeap = NULL;
 }