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

Timestamp:

Dec 22, 2015 1:45:26 PM (9 years ago)

Author:

vboxsync

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

104838

Message:

HDA: Fixed SSM handling for stream BDLEs.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchHda.cpp (modified) (5 diffs)
• DevIchHdaCodec.h (modified) (1 diff)

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

@@ -3589 +3589 @@
     for (uint32_t i = 0; i < pStrm->State.cBDLE; i++)
     {
-        rc = SSMR3PutStructEx(pSSM, &pStrm->State.paBDLE[i], sizeof(HDABDLE), 0 /*fFlags*/, g_aSSMBDLEStateFields5, NULL);
+        rc = SSMR3PutStructEx(pSSM, &pStrm->State.paBDLE[i].State, sizeof(HDABDLESTATE),
+                              0 /*fFlags*/, g_aSSMBDLEStateFields5, NULL);
         AssertRCReturn(rc, rc);
     }
@@ -3673 +3674 @@
         /* Since version 4 we store the register count to stay flexible. */
         case HDA_SSM_VERSION_4:
+        case HDA_SSM_VERSION_5:
         case HDA_SSM_VERSION:
             rc = SSMR3GetU32(pSSM, &cRegs); AssertRCReturn(rc, rc);
@@ -3759 +3761 @@
 
         /* Since v5 we support flexible stream and BDLE counts. */
+        case HDA_SSM_VERSION_5:
         case HDA_SSM_VERSION:
         {
@@ -3794 +3797 @@
                 }
 
+                RT_BZERO(pStrm, sizeof(HDASTREAM));
                 rc = SSMR3GetStructEx(pSSM, &pStrm->State, sizeof(HDASTREAMSTATE), 0 /* fFlags */, g_aSSMStreamStateFields5, NULL);
                 AssertRCBreak(rc);
@@ -3800 +3804 @@
                 AssertRCBreak(rc);
 
-                /* Load BDLE states. */
-                for (uint32_t a = 0; a < pStrm->State.cBDLE; a++)
+                if (uVersion == HDA_SSM_VERSION_5)
                 {
-                    rc = SSMR3GetStructEx(pSSM, &pStrm->State.paBDLE[a].State, sizeof(HDABDLESTATE),
-                                          0 /* fFlags */, g_aSSMBDLEStateFields5, NULL);
+                    /* v5 did not save the BDLE state correctly, so skip. */
+                    rc = SSMR3Skip(pSSM, 0x120 /* sizeof(HDABLDE) in v5 */);
                     AssertRCBreak(rc);
+                }
+                else
+                {
+                    /* Load BDLE states. */
+                    for (uint32_t a = 0; a < pStrm->State.cBDLE; a++)
+                    {
+                        rc = SSMR3GetStructEx(pSSM, &pStrm->State.paBDLE[a].State, sizeof(HDABDLESTATE),
+                                              0 /* fFlags */, g_aSSMBDLEStateFields5, NULL);
+                        AssertRCBreak(rc);
+                    }
                 }
 

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

@@ -131 +131 @@
 int hdaCodecOpenStream(PHDACODEC pThis, PDMAUDIORECSOURCE enmRecSource, PDMAUDIOSTREAMCFG *pAudioSettings);
 
-#define HDA_SSM_VERSION   5
+#define HDA_SSM_VERSION   6
+/** Introduced dynamic number of streams + stream identifiers for serialization.
+ *  Bug: Did not save the BDLE states correctly.
+ *  Those will be skipped on load then. */
+#define HDA_SSM_VERSION_5 5
+/** Since this version the number of MMIO registers can be flexible. */
+#define HDA_SSM_VERSION_4 4
+#define HDA_SSM_VERSION_3 3
+#define HDA_SSM_VERSION_2 2
 #define HDA_SSM_VERSION_1 1
-#define HDA_SSM_VERSION_2 2
-#define HDA_SSM_VERSION_3 3
-/* Since this version the number of MMIO registers can be flexible. */
-#define HDA_SSM_VERSION_4 4
 
 # ifdef VBOX_WITH_HDA_CODEC_EMU