Changeset 94829 in vbox

Timestamp:

May 5, 2022 6:21:36 AM (3 years ago)

Author:

vboxsync

Message:

Audio/SB16: Try fixing SSM load assertions when stored PCM properties are 0 (or not valid) [nits].

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (2 diffs)

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

@@ -2447 +2447 @@
 static int sb16Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, PSB16STATE pThis)
 {
-    unsigned const idxStream = SB16_IDX_OUT; /* The one and only stream we have right now. */
-
     PCPDMDEVHLPR3 pHlp  = pDevIns->pHlpR3;
-    PSB16STREAM pStream = &pThis->aStreams[idxStream]; /* The saved state only contains the one-and-only output stream. */
+    PSB16STREAM pStream = &pThis->aStreams[SB16_IDX_OUT]; /* The saved state only contains the one-and-only output stream. */
     int rc;
 
@@ -2526 +2524 @@
         /* Sanity: If stream is going be enabled, PCM props must be valid. Otherwise the saved state is borked somehow. */
         AssertMsgReturn(AudioHlpPcmPropsAreValid(&pStream->Cfg.Props),
-                        ("PCM properties for stream #%RU8 are invalid\n", idxStream), VERR_INVALID_PARAMETER);
+                        ("PCM properties for stream #%RU8 are invalid\n", pStream->uIdx), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
         sb16StreamControl(pDevIns, pThis, pStream, true /* fRun */);
     }