Changeset 19666 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 13, 2009 3:31:31 PM (16 years ago)

Author:

vboxsync

Message:

Deal with VMMCALLHOST_MMHYPER_LOCK correctly.

File:

• trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp

@@ -158 +158 @@
  * @param   pVM     The VM handle.
  */
-VMMDECL(int) MMHyperLock(PVM pVM)
+static int mmHyperLock(PVM pVM)
 {
     PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
@@ -189 +189 @@
  * @param   pVM     The VM handle.
  */
-VMMDECL(void) MMHyperUnlock(PVM pVM)
+static void mmHyperUnlock(PVM pVM)
 {
     PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
@@ -336 +336 @@
     int rc;
 
-    rc = MMHyperLock(pVM);
+    rc = mmHyperLock(pVM);
     AssertRCReturn(rc, rc);
 
     rc = mmHyperAllocInternal(pVM, cb, uAlignment, enmTag, ppv);
 
-    MMHyperUnlock(pVM);
+    mmHyperUnlock(pVM);
     return rc;
 }
@@ -916 +916 @@
     int rc;
 
-    rc = MMHyperLock(pVM);
+    rc = mmHyperLock(pVM);
     AssertRCReturn(rc, rc);
 
     rc = mmHyperFreeInternal(pVM, pv);
 
-    MMHyperUnlock(pVM);
+    mmHyperUnlock(pVM);
     return rc;
 }
@@ -1195 +1195 @@
 {
 #ifdef MMHYPER_HEAP_STRICT
+    int rc;
+
+    rc = mmHyperLock(pVM);
+    AssertRC(rc);
     mmHyperHeapCheck(pVM->mm.s.CTX_SUFF(pHyperHeap));
+    mmHyperUnlock(pVM);
 #endif
 }