Changeset 89872 in vbox for trunk

Timestamp:

Jun 24, 2021 9:06:52 AM (4 years ago)

Author:

vboxsync

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

145330

Message:

DevHda: Don't forget to destroy the critical section. Cleanups. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHda.cpp (modified) (5 diffs)
• DevHda.h (modified) (1 diff)

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

@@ -4247 +4247 @@
 static void hdaR3DbgPrintBDL(PPDMDEVINS pDevIns, PHDASTATE pThis, PCDBGFINFOHLP pHlp, int idxStream)
 {
-    const PHDASTREAM   pStream     = &pThis->aStreams[idxStream];
-    PCPDMAUDIOPCMPROPS pGuestProps = &pStream->State.Cfg.Props; /** @todo We don't make a distinction any more. The mixer hides that now. */
-
-    uint64_t const u64BaseDMA = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, idxStream),
-                                            HDA_STREAM_REG(pThis, BDPU, idxStream));
-    uint16_t const u16LVI     = HDA_STREAM_REG(pThis, LVI, idxStream);
-    uint32_t const u32CBL     = HDA_STREAM_REG(pThis, CBL, idxStream);
-    uint8_t const  idxCurBdle = pStream->State.idxCurBdle;
+    const PHDASTREAM   pStream  = &pThis->aStreams[idxStream];
+    PCPDMAUDIOPCMPROPS pProps   = &pStream->State.Cfg.Props;
+    uint64_t const u64BaseDMA   = RT_MAKE_U64(HDA_STREAM_REG(pThis, BDPL, idxStream),
+                                              HDA_STREAM_REG(pThis, BDPU, idxStream));
+    uint16_t const u16LVI       = HDA_STREAM_REG(pThis, LVI, idxStream);
+    uint32_t const u32CBL       = HDA_STREAM_REG(pThis, CBL, idxStream);
+    uint8_t const  idxCurBdle   = pStream->State.idxCurBdle;
     pHlp->pfnPrintf(pHlp, "Stream #%d BDL: %s%#011RX64 LB %#x (LVI=%u)\n", idxStream, "%%" /*vboxdbg phys prefix*/,
                     u64BaseDMA, u16LVI * sizeof(HDABDLEDESC), u16LVI);
@@ -4280 +4279 @@
             RTStrPrintf(szFlags, sizeof(szFlags), " !!fFlags=%#x!!\n", bd.fFlags);
         pHlp->pfnPrintf(pHlp, "    %sBDLE%03u: %s%#011RX64 LB %#06x (%RU64 us) %s%s\n", idxCurBdle == i ? "=>" : "  ", i, "%%",
-                        bd.u64BufAddr, bd.u32BufSize, PDMAudioPropsBytesToMicro(pGuestProps, bd.u32BufSize),
+                        bd.u64BufAddr, bd.u32BufSize, PDMAudioPropsBytesToMicro(pProps, bd.u32BufSize),
                         bd.fFlags & HDA_BDLE_F_IOC ? " IOC=1" : "", szFlags);
 
@@ -4295 +4294 @@
     }
     pHlp->pfnPrintf(pHlp, "  Total: %#RX64 bytes (%RU64), %RU64 ms\n", cbTotal, cbTotal,
-                    PDMAudioPropsBytesToMilli(pGuestProps, (uint32_t)cbTotal));
+                    PDMAudioPropsBytesToMilli(pProps, (uint32_t)cbTotal));
     if (cbTotal != u32CBL)
         pHlp->pfnPrintf(pHlp, "  Warning: %#RX64 bytes does not match CBL (%#RX64)!\n", cbTotal, u32CBL);
@@ -4684 +4683 @@
     PHDASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PHDASTATE);
     PHDASTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATER3);
-    DEVHDA_LOCK(pDevIns, pThis); /** @todo r=bird: this will fail on early constructor failure. */
+
+    if (PDMCritSectIsInitialized(&pThis->CritSect))
+        PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
 
     PHDADRIVER pDrv;
@@ -4713 +4714 @@
     }
 
-    DEVHDA_UNLOCK(pDevIns, pThis);
+    if (PDMCritSectIsInitialized(&pThis->CritSect))
+    {
+        PDMCritSectLeave(&pThis->CritSect);
+        PDMR3CritSectDelete(&pThis->CritSect);
+    }
     return VINF_SUCCESS;
 }

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

@@ -23 +23 @@
 
 #include <iprt/path.h>
-
 #include <VBox/vmm/pdmdev.h>
-
 #include "AudioMixer.h"