Changeset 90445 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

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

Author:

vboxsync

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

146049

Message:

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

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevATA.cpp (modified) (8 diffs)
• DevBusLogic.cpp (modified) (1 diff)
• DevLsiLogicSCSI.cpp (modified) (4 diffs)

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

@@ -897 +897 @@
 {
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     pCtl->AsyncIOReqHead = 0;
@@ -910 +910 @@
 {
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     uint8_t const iAsyncIORequest = pCtl->AsyncIOReqHead % RT_ELEMENTS(pCtl->aAsyncIORequests);
@@ -935 +935 @@
 
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     if (pCtl->AsyncIOReqHead != pCtl->AsyncIOReqTail)
@@ -960 +960 @@
 {
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     if (pCtl->AsyncIOReqHead != pCtl->AsyncIOReqTail && pCtl->aAsyncIORequests[pCtl->AsyncIOReqTail].ReqType == ReqType)
@@ -984 +984 @@
 {
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     LogRel(("PIIX3 ATA: Ctl#%d: request queue dump (topmost is current):\n", pCtl->iCtl));
@@ -1038 +1038 @@
 {
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     bool fIdle = pCtl->fRedoIdle;
@@ -1268 +1268 @@
 {
     STAM_PROFILE_START(&pCtl->StatLockWait, a);
-    PDMDevHlpCritSectEnter(pDevIns, &pCtl->lock, VINF_SUCCESS);
+    int const rcLock = PDMDevHlpCritSectEnter(pDevIns, &pCtl->lock, VINF_SUCCESS);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->lock, rcLock);
     STAM_PROFILE_STOP(&pCtl->StatLockWait, a);
 }
@@ -5766 +5767 @@
      */
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pCtl->AsyncIORequestLock, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pCtl->AsyncIORequestLock, rc);
 
     if (    pCtlR3->fSignalIdle

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

@@ -1375 +1375 @@
 
     int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSectIntr, VINF_SUCCESS);
-    AssertRC(rc);
+    PDM_CRITSECT_RELEASE_ASSERT_RC_DEV(pDevIns, &pThis->CritSectIntr, rc);
 
     RTGCPHYS GCPhysAddrMailboxIncoming = pThis->GCPhysAddrMailboxIncomingBase

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. */