Changeset 18213 in vbox for trunk/src

Timestamp:

Mar 24, 2009 6:15:41 PM (16 years ago)

Author:

vboxsync

Message:

GVMMR0: Don't forget to call GMM for init and cleanup on VM object destruction.

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -40 +40 @@
 #define LOG_GROUP LOG_GROUP_GVMM
 #include <VBox/gvmm.h>
+#include <VBox/gmm.h>
 #include "GVMMR0Internal.h"
 #include <VBox/gvm.h>
@@ -579 +580 @@
 
                         gvmmR0InitPerVMData(pGVM);
-                        /* GMMR0InitPerVMData(pGVM); - later */
+                        GMMR0InitPerVMData(pGVM);
 
                         /*
@@ -868 +869 @@
  * @param   pGVM        The GVM pointer.
  */
-static void gmmR0CleanupVM(PGVM pGVM)
+static void gvmmR0CleanupVM(PGVM pGVM)
 {
     if (    pGVM->gvmm.s.fDoneVMMR0Init
@@ -876 +877 @@
             &&  RTR0MemObjAddress(pGVM->gvmm.s.VMMemObj) == pGVM->pVM)
         {
-            LogFlow(("gmmR0CleanupVM: Calling VMMR0TermVM\n"));
+            LogFlow(("gvmmR0CleanupVM: Calling VMMR0TermVM\n"));
             VMMR0TermVM(pGVM->pVM, pGVM);
         }
         else
-            AssertMsgFailed(("gmmR0CleanupVM: VMMemObj=%p pVM=%p\n", pGVM->gvmm.s.VMMemObj, pGVM->pVM));
-    }
+            AssertMsgFailed(("gvmmR0CleanupVM: VMMemObj=%p pVM=%p\n", pGVM->gvmm.s.VMMemObj, pGVM->pVM));
+    }
+
+    GMMR0CleanupVM(pGVM);
 }
 
@@ -975 +978 @@
         &&  pGVM->u32Magic == GVM_MAGIC)
     {
-        gmmR0CleanupVM(pGVM);
+        gvmmR0CleanupVM(pGVM);
 
         /*