Changeset 20776 in vbox

Timestamp:

Jun 22, 2009 1:09:03 PM (15 years ago)

Author:

vboxsync

Message:

IOMR3MMIODeregister: unlock in assertion return paths

File:

• trunk/src/VBox/VMM/IOM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/IOM.cpp

@@ -1662 +1662 @@
             return VERR_IOM_MMIO_RANGE_NOT_FOUND;
         }
-        AssertMsgReturn(pRange->pDevInsR3 == pDevIns,
-                        ("Not owner! GCPhys=%RGp %RGp LB%#x %s\n", GCPhys, GCPhysStart, cbRange, pRange->pszDesc),
-                        VERR_IOM_NOT_MMIO_RANGE_OWNER);
-        AssertMsgReturn(pRange->Core.KeyLast <= GCPhysLast,
-                        ("Incomplete R3 range! GCPhys=%RGp %RGp LB%#x %s\n", GCPhys, GCPhysStart, cbRange, pRange->pszDesc),
-                        VERR_IOM_INCOMPLETE_MMIO_RANGE);
+        AssertMsgReturnStmt(pRange->pDevInsR3 == pDevIns,
+                            ("Not owner! GCPhys=%RGp %RGp LB%#x %s\n", GCPhys, GCPhysStart, cbRange, pRange->pszDesc),
+                            iomUnlock(pVM),
+                            VERR_IOM_NOT_MMIO_RANGE_OWNER);
+        AssertMsgReturnStmt(pRange->Core.KeyLast <= GCPhysLast,
+                            ("Incomplete R3 range! GCPhys=%RGp %RGp LB%#x %s\n", GCPhys, GCPhysStart, cbRange, pRange->pszDesc),
+                            iomUnlock(pVM),
+                            VERR_IOM_INCOMPLETE_MMIO_RANGE);
 
         /* next */
@@ -1699 +1701 @@
         MMHyperFree(pVM, pRange);
     }
+
     iomUnlock(pVM);
-
     return VINF_SUCCESS;
 }