Changeset 82308 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 1, 2019 1:20:59 AM (5 years ago)

Author:

vboxsync

Message:

DevHDA: Fixed bug in hdaCodecLoadState showcasing why switch aren't the best way of handling saved state versions. If the switch has current-version case, it's either already broken or just waiting for it to happen. (Current version shouldn't be used anywhere but in the registration statement.) This one broke when the state version was last bumped. bugref:9218

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• HDACodec.cpp (modified) (1 diff)

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

@@ -3743 +3743 @@
 
         default:
-            LogRel(("HDA: Warning: Unsupported / too new saved state version (%RU32)\n", uVersion));
-            return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+            AssertLogRelMsgFailedReturn(("HDA: Internal Error! Didn't expect saved state version %RU32 ending up in hdaR3LoadExecLegacy!\n",
+                                         uVersion), VERR_INTERNAL_ERROR_5);
     }
 

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

@@ -3129 +3129 @@
     PCSSMFIELD pFields = NULL;
     uint32_t   fFlags  = 0;
-    switch (uVersion)
-    {
-        case HDA_SAVED_STATE_VERSION_1:
-            AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
-            pFields = g_aCodecNodeFieldsV1;
-            fFlags  = SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED;
-            break;
-
-        case HDA_SAVED_STATE_VERSION_2:
-        case HDA_SAVED_STATE_VERSION_3:
-            AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
-            pFields = g_aCodecNodeFields;
-            fFlags  = SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED;
-            break;
-
+    if (uVersion >= HDA_SAVED_STATE_VERSION_4)
+    {
         /* Since version 4 a flexible node count is supported. */
-        case HDA_SAVED_STATE_VERSION_4:
-        case HDA_SAVED_STATE_VERSION_5:
-        case HDA_SAVED_STATE_VERSION:
-        {
-            uint32_t cNodes;
-            int rc2 = SSMR3GetU32(pSSM, &cNodes);
-            AssertRCReturn(rc2, rc2);
-            AssertReturn(cNodes == 0x1c, VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
-            AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
-
-            pFields = g_aCodecNodeFields;
-            fFlags  = 0;
-            break;
-        }
-
-        default:
-            AssertFailedReturn(VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
-    }
+        uint32_t cNodes;
+        int rc2 = SSMR3GetU32(pSSM, &cNodes);
+        AssertRCReturn(rc2, rc2);
+        AssertReturn(cNodes == 0x1c, VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
+        AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
+
+        pFields = g_aCodecNodeFields;
+        fFlags  = 0;
+    }
+    else if (uVersion >= HDA_SAVED_STATE_VERSION_2)
+    {
+        AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
+        pFields = g_aCodecNodeFields;
+        fFlags  = SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED;
+    }
+    else if (uVersion >= HDA_SAVED_STATE_VERSION_1)
+    {
+        AssertReturn(pThis->cTotalNodes == 0x1c, VERR_INTERNAL_ERROR);
+        pFields = g_aCodecNodeFieldsV1;
+        fFlags  = SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED;
+    }
+    else
+        AssertFailedReturn(VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
 
     for (unsigned idxNode = 0; idxNode < pThis->cTotalNodes; ++idxNode)