Changeset 81051 in vbox

Timestamp:

Sep 27, 2019 12:24:20 PM (5 years ago)

Author:

vboxsync

Message:

DevPciIch9: Always save the MSI-X state size. bugref:9218

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1152 +1152 @@
                 SSMR3PutMem(pSSM, pDev->abMsixState, pDev->Int.s.cbMsixRegion);
             }
+            else
+                SSMR3PutU32(pSSM, 0);
 
             /* Save the type an size of all the regions. */
@@ -1650 +1652 @@
 
         /* Load MSI-X page state */
-        if (u.DevTmp.Int.s.u8MsixCapOffset != 0)
-        {
-            uint32_t cbMsixState = _4K;
-            if (uVersion >= VBOX_ICH9PCI_SAVED_STATE_VERSION_4KB_CFG_SPACE)
-            {
-                rc = SSMR3GetU32(pSSM, &cbMsixState);
-                AssertRCReturn(rc, rc);
-                if (   cbMsixState > (uint32_t)(pDev ? pDev->cbMsixState : _32K + _16K)
-                    || cbMsixState > sizeof(u) - RT_UOFFSETOF(PDMPCIDEV, abMsixState))
-                    return SSMR3SetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
-                                             "cbMsixState=%#RX32, expected at most RT_MIN(%#x, %#zx)",
-                                             cbMsixState, (pDev ? pDev->cbMsixState : _32K + _16K),
-                                             sizeof(u) - RT_UOFFSETOF(PDMPCIDEV, abMsixState));
-            }
+        uint32_t cbMsixState = u.DevTmp.Int.s.u8MsixCapOffset != 0 ? _4K : 0;
+        if (uVersion >= VBOX_ICH9PCI_SAVED_STATE_VERSION_4KB_CFG_SPACE)
+        {
+            rc = SSMR3GetU32(pSSM, &cbMsixState);
+            AssertRCReturn(rc, rc);
+        }
+        if (cbMsixState)
+        {
+            if (   cbMsixState > (uint32_t)(pDev ? pDev->cbMsixState : _32K + _16K)
+                || cbMsixState > sizeof(u) - RT_UOFFSETOF(PDMPCIDEV, abMsixState))
+                return SSMR3SetLoadError(pSSM, VERR_SSM_DATA_UNIT_FORMAT_CHANGED, RT_SRC_POS,
+                                         "cbMsixState=%#RX32, expected at most RT_MIN(%#x, %#zx)",
+                                         cbMsixState, (pDev ? pDev->cbMsixState : _32K + _16K),
+                                         sizeof(u) - RT_UOFFSETOF(PDMPCIDEV, abMsixState));
             rc = SSMR3GetMem(pSSM, u.DevTmp.abMsixState, cbMsixState);
             AssertRCReturn(rc, rc);