Changeset 100766 in vbox for trunk

Timestamp:

Aug 1, 2023 10:58:33 AM (19 months ago)

Author:

vboxsync

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

158637

Message:

Devices/Bus/DevPciGenericEcam: Fixes for saved state loading, need to save and restore the PCI interrupt levels of course, bugref:10445

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPciGenericEcam.cpp (modified) (1 diff)
• DevPciIch9.cpp (modified) (2 diffs)

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

@@ -60 +60 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+/** @todo As this shares a lot of code with the ICH9 PCI device we have to also keep the saved state version in sync. */
 /** Saved state version of the generic ECAM PCI bus device. */
-#define VBOX_PCIGENECAM_SAVED_STATE_VERSION             1
+#define VBOX_PCIGENECAM_SAVED_STATE_VERSION             VBOX_ICH9PCI_SAVED_STATE_VERSION_4KB_CFG_SPACE
+/** 4KB config space */
+#define VBOX_ICH9PCI_SAVED_STATE_VERSION_4KB_CFG_SPACE  4
 
 

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

@@ -1163 +1163 @@
      * Save IRQ states.
      */
-    for (unsigned i = 0; i < RT_ELEMENTS(pThis->auPciApicIrqLevels); i++)
-        pHlp->pfnSSMPutU32(pSSM, pThis->auPciApicIrqLevels[i]);
+    if (pThis->PciBus.enmType == DEVPCIBUSTYPE_ICH9)
+    {
+        for (unsigned i = 0; i < RT_ELEMENTS(pThis->auPciApicIrqLevels); i++)
+            pHlp->pfnSSMPutU32(pSSM, pThis->auPciApicIrqLevels[i]);
+    }
+    else if (pThis->PciBus.enmType == DEVPCIBUSTYPE_GENERIC_ECAM)
+    {
+        for (unsigned i = 0; i < RT_ELEMENTS(pThis->u.GenericEcam.auPciIrqLevels); i++)
+            pHlp->pfnSSMPutU32(pSSM, pThis->u.GenericEcam.auPciIrqLevels[i]);
+    }
+    else
+        AssertReleaseFailed();
 
     pHlp->pfnSSMPutU32(pSSM, UINT32_MAX);  /* separator */
@@ -1745 +1755 @@
      * Load IRQ states.
      */
-    for (unsigned i = 0; i < RT_ELEMENTS(pThis->auPciApicIrqLevels); i++)
-        pHlp->pfnSSMGetU32V(pSSM, &pThis->auPciApicIrqLevels[i]);
+    if (pThis->PciBus.enmType == DEVPCIBUSTYPE_ICH9)
+    {
+        for (unsigned i = 0; i < RT_ELEMENTS(pThis->auPciApicIrqLevels); i++)
+            pHlp->pfnSSMGetU32V(pSSM, &pThis->auPciApicIrqLevels[i]);
+    }
+    else if (pThis->PciBus.enmType == DEVPCIBUSTYPE_GENERIC_ECAM)
+    {
+        for (unsigned i = 0; i < RT_ELEMENTS(pThis->u.GenericEcam.auPciIrqLevels); i++)
+            pHlp->pfnSSMGetU32V(pSSM, &pThis->u.GenericEcam.auPciIrqLevels[i]);
+    }
+    else
+        AssertReleaseFailed();
 
     /* separator */