Changeset 19793 in vbox

Timestamp:

May 18, 2009 2:30:15 PM (15 years ago)

Author:

vboxsync

Message:

Deal with critical section nesting when trying to clean up after a guru meditation.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• IOM.cpp (modified) (1 diff)
• MMHyper.cpp (modified) (1 diff)
• PDM.cpp (modified) (1 diff)
• PGM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -3612 +3612 @@
 VMMR3DECL(void) EMR3ReleaseOwnedLocks(PVM pVM)
 {
-    if (PDMCritSectIsOwner(&pVM->em.s.CritSectREM))
+    while (PDMCritSectIsOwner(&pVM->em.s.CritSectREM))
         PDMCritSectLeave(&pVM->em.s.CritSectREM);
 }

trunk/src/VBox/VMM/IOM.cpp

@@ -1652 +1652 @@
 VMMR3DECL(void) IOMR3ReleaseOwnedLocks(PVM pVM)
 {
-    if (PDMCritSectIsOwner(&pVM->iom.s.EmtLock))
+    while (PDMCritSectIsOwner(&pVM->iom.s.EmtLock))
         PDMCritSectLeave(&pVM->iom.s.EmtLock);
 }

trunk/src/VBox/VMM/MMHyper.cpp

@@ -1099 +1099 @@
     PMMHYPERHEAP pHeap = pVM->mm.s.CTX_SUFF(pHyperHeap);
 
-    if (PDMCritSectIsOwner(&pHeap->Lock))
+    while (pHeap && PDMCritSectIsOwner(&pHeap->Lock))
         PDMCritSectLeave(&pHeap->Lock);
 }

trunk/src/VBox/VMM/PDM.cpp

@@ -1449 +1449 @@
 VMMR3DECL(void) PDMR3ReleaseOwnedLocks(PVM pVM)
 {
-    if (PDMCritSectIsOwner(&pVM->pdm.s.CritSect))
+    while (PDMCritSectIsOwner(&pVM->pdm.s.CritSect))
         PDMCritSectLeave(&pVM->pdm.s.CritSect);
 }

trunk/src/VBox/VMM/PGM.cpp

@@ -4063 +4063 @@
 VMMR3DECL(void) PGMR3ReleaseOwnedLocks(PVM pVM)
 {
-    if (PDMCritSectIsOwner(&pVM->pgm.s.CritSect))
+    while (PDMCritSectIsOwner(&pVM->pgm.s.CritSect))
         PDMCritSectLeave(&pVM->pgm.s.CritSect);
 }