Changeset 90318 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jul 23, 2021 4:26:25 PM (4 years ago)

Author:

vboxsync

Message:

DevIoApic: Must save & restore the flip-flop bitmap. bugref:10073 oem2ticketref:43

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -36 +36 @@
 *********************************************************************************************************************************/
 /** The current IO APIC saved state version. */
-#define IOAPIC_SAVED_STATE_VERSION              2
+#define IOAPIC_SAVED_STATE_VERSION                  3
+/** The current IO APIC saved state version. */
+#define IOAPIC_SAVED_STATE_VERSION_NO_FLIPFLOP_MAP  2
 /** The saved state version used by VirtualBox 5.0 and
  *  earlier.  */
@@ -1433 +1435 @@
         pHlp->pfnSSMPutU64(pSSM, pThis->au64RedirTable[idxRte]);
 
+    for (uint8_t idx = 0; idx < RT_ELEMENTS(pThis->bmFlipFlop); idx++)
+        pHlp->pfnSSMPutU64(pSSM, pThis->bmFlipFlop[idx]);
+
     return VINF_SUCCESS;
 }
@@ -1451 +1456 @@
     /* Weed out invalid versions. */
     if (   uVersion != IOAPIC_SAVED_STATE_VERSION
+        && uVersion != IOAPIC_SAVED_STATE_VERSION_NO_FLIPFLOP_MAP
         && uVersion != IOAPIC_SAVED_STATE_VERSION_VBOX_50)
     {
@@ -1457 +1463 @@
     }
 
-    if (uVersion == IOAPIC_SAVED_STATE_VERSION)
+    if (uVersion >= IOAPIC_SAVED_STATE_VERSION_NO_FLIPFLOP_MAP)
         pHlp->pfnSSMGetU32(pSSM, &pThis->uIrr);
 
@@ -1464 +1470 @@
     for (uint8_t idxRte = 0; idxRte < RT_ELEMENTS(pThis->au64RedirTable); idxRte++)
         pHlp->pfnSSMGetU64(pSSM, &pThis->au64RedirTable[idxRte]);
+
+    if (uVersion > IOAPIC_SAVED_STATE_VERSION_NO_FLIPFLOP_MAP)
+        for (uint8_t idx = 0; idx < RT_ELEMENTS(pThis->bmFlipFlop); idx++)
+            pHlp->pfnSSMGetU64(pSSM, &pThis->bmFlipFlop[idx]);
 
     return VINF_SUCCESS;