Changeset 89739 in vbox

Timestamp:

Jun 16, 2021 11:05:22 AM (4 years ago)

Author:

vboxsync

Message:

DevIchAc97: Make sure to retry ichac97R3MixerAddDrvStreams after a while if it fails (current code would just not retry unless the config (Hz) changed). bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (8 diffs)

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

@@ -382 +382 @@
      *  commits to proving actual audio input bytes. */
     bool                    fInputPreBuffered;
+    /** This is ZERO if stream setup succeeded, otherwise it's the RTTimeNanoTS() at
+     *  which to retry setting it up.  The latter applies only to same
+     *  parameters. */
+    uint64_t                nsRetrySetup;
     /** (Virtual) clock ticks per transfer. */
     uint64_t                cTransferTicks;
@@ -1063 +1067 @@
 
     PRTCIRCBUF pCircBuf = pStreamCC->State.pCircBuf;
-    AssertPtr(pCircBuf);
+    AssertReturnStmt(pCircBuf, ichac97R3StreamUnlock(pStreamCC), VINF_SUCCESS);
 
     int rc = VINF_SUCCESS;
@@ -1865 +1869 @@
         if (RT_SUCCESS(rc))
         {
-
             PAC97DRIVER pDrv;
             RTListForEach(&pThisCC->lstDrv, pDrv, AC97DRIVER, Node)
@@ -2205 +2208 @@
     int rc = VINF_SUCCESS;
     if (   fForce
-        || !PDMAudioStrmCfgMatchesProps(&Cfg, &pStreamCC->State.Cfg.Props))
+        || !PDMAudioStrmCfgMatchesProps(&Cfg, &pStreamCC->State.Cfg.Props)
+        || (pStreamCC->State.nsRetrySetup && RTTimeNanoTS() >= pStreamCC->State.nsRetrySetup))
     {
         LogRel2(("AC97: Setting up stream #%u: %s\n", pStreamCC->u8SD, PDMAudioStrmCfgToString(&Cfg, szTmp, sizeof(szTmp)) ));
 
         ichac97R3MixerRemoveDrvStreams(pDevIns, pThisCC, pMixSink, Cfg.enmDir, Cfg.enmPath);
+
         rc = ichac97R3MixerAddDrvStreams(pDevIns, pThisCC, pMixSink, &Cfg);
         if (RT_SUCCESS(rc))
         {
             PDMAudioStrmCfgCopy(&pStreamCC->State.Cfg, &Cfg);
+            pStreamCC->State.nsRetrySetup = 0;
             LogFlowFunc(("[SD%RU8] success (uHz=%u)\n", pStreamCC->u8SD, rc, PDMAudioPropsHz(&Cfg.Props)));
         }
@@ -2220 +2226 @@
             LogFunc(("[SD%RU8] ichac97R3MixerAddDrvStreams failed: %Rrc (uHz=%u)\n",
                      pStreamCC->u8SD, rc, PDMAudioPropsHz(&Cfg.Props)));
-            /** @todo r=bird: we should remember this somehow and prevent things from
-             *        working and ensure that we redo setup the next time the guest
-             *        tries to play/record something with this stream... */
+            pStreamCC->State.nsRetrySetup = RTTimeNanoTS() + 5*RT_NS_1SEC; /* retry in 5 seconds, unless config changes. */
         }
     }
@@ -2301 +2305 @@
         pStreamCC->State.fInputPreBuffered = false;
 
-        /* (Re-)Open the stream if necessary. */
+        /* Set up (update) the AC'97 stream as needed. */
         rc = ichac97R3StreamSetUp(pDevIns, pThis, pThisCC, pStream, pStreamCC, false /* fForce */);
         if (RT_SUCCESS(rc))
         {
-            /*
-             * Open debug files.
-             */
+            /* Open debug files. */
             if (RT_LIKELY(!pStreamCC->Dbg.Runtime.fEnabled))
             { /* likely */ }
@@ -2320 +2322 @@
             }
 
-            /*
-             * Do the actual enabling.
-             */
+            /* Do the actual enabling (won't fail as long as pSink is valid). */
             rc = AudioMixerSinkStart(pSink);
         }
@@ -2678 +2678 @@
         PAC97BMREGS     pRegs     = &pStream->Regs;
 
+        /** @todo r=bird: this locking is overkill, we don't need the timer lock
+         *        unless we're going to call ichac97R3TimerSet. */
         DEVAC97_LOCK_BOTH_RETURN(pDevIns, pThis, pStream, VINF_IOM_R3_IOPORT_WRITE);
         switch (cb)