Changeset 82305 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 30, 2019 8:15:05 PM (5 years ago)

Author:

vboxsync

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

135129

Message:

DevHDA: Same for older state versions. bugref:9218

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (3 diffs)

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

@@ -3761 +3761 @@
         default: /* Since v5 we support flexible stream and BDLE counts. */
         {
+            /* Stream count. */
             uint32_t cStreams;
             rc = pHlp->pfnSSMGetU32(pSSM, &cStreams);
             AssertRCReturn(rc, rc);
-
             if (cStreams > HDA_MAX_STREAMS)
-                cStreams = HDA_MAX_STREAMS; /* Sanity. */
+                return pHlp->pfnSSMSetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
+                                                N_("State contains %u streams while %u is the maximum supported"),
+                                                cStreams, HDA_MAX_STREAMS);
 
             /* Load stream states. */
             for (uint32_t i = 0; i < cStreams; i++)
             {
-                uint8_t uStreamID;
-                rc = pHlp->pfnSSMGetU8(pSSM, &uStreamID);
+                uint8_t idStream;
+                rc = pHlp->pfnSSMGetU8(pSSM, &idStream);
                 AssertRCReturn(rc, rc);
 
-                PHDASTREAM pStream = hdaGetStreamFromSD(pThis, uStreamID);
+                PHDASTREAM pStream = hdaGetStreamFromSD(pThis, idStream);
                 HDASTREAM  StreamDummy;
 
@@ -3781 +3783 @@
                 {
                     pStream = &StreamDummy;
-                    LogRel2(("HDA: Warning: Stream ID=%RU32 not supported, skipping to load ...\n", uStreamID));
+                    LogRel2(("HDA: Warning: Stream ID=%RU32 not supported, skipping to load ...\n", idStream));
                 }
 
-                rc = hdaR3StreamInit(pStream, uStreamID);
+                rc = hdaR3StreamInit(pStream, idStream);
                 if (RT_FAILURE(rc))
                 {
-                    LogRel(("HDA: Stream #%RU32: Initialization of stream %RU8 failed, rc=%Rrc\n", i, uStreamID, rc));
+                    LogRel(("HDA: Stream #%RU32: Initialization of stream %RU8 failed, rc=%Rrc\n", i, idStream, rc));
                     break;
                 }
@@ -3864 +3866 @@
                     AssertRCReturn(rc, rc);
 
-                    Log2Func(("[SD%RU8] LPIB=%RU32, CBL=%RU32, LVI=%RU32\n", uStreamID, HDA_STREAM_REG(pThis, LPIB, uStreamID),
-                              HDA_STREAM_REG(pThis, CBL, uStreamID), HDA_STREAM_REG(pThis, LVI, uStreamID)));
+                    Log2Func(("[SD%RU8] LPIB=%RU32, CBL=%RU32, LVI=%RU32\n", idStream, HDA_STREAM_REG(pThis, LPIB, idStream),
+                              HDA_STREAM_REG(pThis, CBL, idStream), HDA_STREAM_REG(pThis, LVI, idStream)));
 #ifdef LOG_ENABLED
                     hdaR3BDLEDumpAll(pThis, pStream->u64BDLBase, pStream->u16LVI + 1);