Changeset 90445 in vbox for trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

Timestamp:

Jul 30, 2021 10:18:24 PM (4 years ago)

Author:

vboxsync

Message:

Dev*: Check PDMDevHlpCritSectEnter return status better. bugref:6695

File:

• trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -729 +729 @@
 static void lsilogicR3FinishContextReply(PPDMDEVINS pDevIns, PLSILOGICSCSI pThis, uint32_t u32MessageContext)
 {
-    int rc;
-
     LogFlowFunc(("pThis=%#p u32MessageContext=%#x\n", pThis, u32MessageContext));
 
@@ -736 +734 @@
 
     /* Write message context ID into reply post queue. */
-    rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
-    AssertRC(rc);
+    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->ReplyPostQueueCritSect, rc);
 
     /* Check for a entry in the queue. */
@@ -792 +790 @@
          */
 # ifdef IN_RING3
-        int rc;
         /* Grab a free reply message from the queue. */
-        rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->ReplyFreeQueueCritSect, VINF_SUCCESS);
-        AssertRC(rc);
+        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->ReplyFreeQueueCritSect, VINF_SUCCESS);
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->ReplyFreeQueueCritSect, rc);
 
         /* Check for a free reply frame. */
@@ -822 +819 @@
         /* Write low 32bits of reply frame into post reply queue. */
         rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->ReplyPostQueueCritSect, VINF_SUCCESS);
-        AssertRC(rc);
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->ReplyPostQueueCritSect, rc);
 
         /* Check for a entry in the queue. */