Changeset 90447 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jul 31, 2021 12:44:13 AM (3 years ago)

Author:

vboxsync

Message:

Dev*: Checked up all the PDMDevHlpCritSectEnter calls to make sure the status code is checked. bugref:6695

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.cpp (modified) (5 diffs)
• DevIchAc97.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DevHda.cpp

@@ -83 +83 @@
 #define DEVHDA_LOCK(a_pDevIns, a_pThis) \
     do { \
-        int rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, VERR_IGNORED); \
-        AssertRC(rcLock); \
+        int const rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, VERR_IGNORED); \
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV((a_pDevIns), &(a_pThis)->CritSect, rcLock); \
     } while (0)
 
@@ -92 +92 @@
 #define DEVHDA_LOCK_RETURN(a_pDevIns, a_pThis, a_rcBusy) \
     do { \
-        int rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, a_rcBusy); \
+        int const rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, a_rcBusy); \
         if (rcLock == VINF_SUCCESS) \
         { /* likely */ } \
@@ -107 +107 @@
 # define DEVHDA_LOCK_RETURN_VOID(a_pDevIns, a_pThis) \
     do { \
-        int rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, VERR_IGNORED); \
+        int const rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, VERR_IGNORED); \
         if (rcLock == VINF_SUCCESS) \
         { /* likely */ } \
         else \
         { \
-            AssertRC(rcLock); \
+            PDM_CRITSECT_RELEASE_ASSERT_RC_DEV((a_pDevIns), &(a_pThis)->CritSect, rcLock); \
             return; \
         } \
@@ -4081 +4081 @@
                             RT_ZERO(StreamDummyShared); RT_ZERO(StreamDummyR3));
 
-        PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED); /* timer code requires this */
+        rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED); /* timer code requires this */
+        AssertRCReturn(rc, rc);
         rc = hdaR3StreamSetUp(pDevIns, pThis, pStreamShared, pStreamR3, idStream);
         PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
@@ -4753 +4754 @@
 
     if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->CritSect))
-        PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
+        (void)PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
 
     PHDADRIVER pDrv;

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -640 +640 @@
 #define DEVAC97_LOCK(a_pDevIns, a_pThis) \
     do { \
-        int rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, VERR_IGNORED); \
-        AssertRC(rcLock); \
+        int const rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, VERR_IGNORED); \
+        PDM_CRITSECT_RELEASE_ASSERT_RC_DEV((a_pDevIns), &(a_pThis)->CritSect, rcLock); \
     } while (0)
 
@@ -651 +651 @@
         int rcLock = PDMDevHlpCritSectEnter((a_pDevIns), &(a_pThis)->CritSect, a_rcBusy); \
         if (rcLock == VINF_SUCCESS) \
-            break; \
-        AssertRC(rcLock); \
-        return rcLock; \
+        { /* likely */ } \
+        else \
+        { \
+            AssertRC(rcLock); \
+            return rcLock; \
+        } \
     } while (0)