Changeset 19666 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

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

47265

Message:

Deal with VMMCALLHOST_MMHYPER_LOCK correctly.

Location:

trunk/src/VBox/VMM

Files:

• MMHyper.cpp (modified) (1 diff)
• PGM.cpp (modified) (1 diff)
• VMM.cpp (modified) (1 diff)
• VMMAll/MMAllHyper.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -338 +338 @@
 }
 
+/**
+ * Service a VMMCALLHOST_MMHYPER_LOCK call.
+ *
+ * @returns VBox status code.
+ * @param   pVM     The VM handle.
+ */
+VMMR3DECL(int) MMR3LockCall(PVM pVM)
+{
+    PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
+
+    int rc = PDMR3CritSectEnterEx(&pHeap->Lock, true /* fHostCall */);
+    AssertRC(rc);
+    return rc;
+}
 
 /**

trunk/src/VBox/VMM/PGM.cpp

@@ -3212 +3212 @@
 
 /**
- * Serivce a VMMCALLHOST_PGM_LOCK call.
+ * Service a VMMCALLHOST_PGM_LOCK call.
  *
  * @returns VBox status code.

trunk/src/VBox/VMM/VMM.cpp

@@ -1586 +1586 @@
         case VMMCALLHOST_MMHYPER_LOCK:
         {
-            pVCpu->vmm.s.rcCallHost = MMHyperLock(pVM);
+            pVCpu->vmm.s.rcCallHost = MMR3LockCall(pVM);
             break;
         }

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
 }