Changeset 61841 in vbox

Timestamp:

Jun 23, 2016 7:31:37 AM (8 years ago)

Author:

vboxsync

Message:

Devices/PC/DevIoApic: allow to read the I/O-APIC state from the new I/O-APIC implementation

File:

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

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

@@ -75 +75 @@
 #define DEBUG_IOAPIC
 #define IOAPIC_NUM_PINS                 0x18
+
+/** The old code (this file) */
+#define IOAPIC_SAVED_STATE_VERSION_VBOX_50      1
+/** The new code (DevIOAPIC_New). We need to be able to load this SSM as well. */
+#define IOAPIC_SAVED_STATE_VERSION_NEW_CODE     2
 
 
@@ -701 +706 @@
 {
     PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
-    if (uVersion != 1)
+    if (   uVersion != IOAPIC_SAVED_STATE_VERSION_VBOX_50
+        && uVersion != IOAPIC_SAVED_STATE_VERSION_NEW_CODE)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+
+    uint32_t ignore;
+    if (uVersion == IOAPIC_SAVED_STATE_VERSION_NEW_CODE)
+        SSMR3GetU32(pSSM, &ignore);
 
     SSMR3GetU8(pSSM, &pThis->id);
@@ -831 +841 @@
     }
 
-    rc = PDMDevHlpSSMRegister(pDevIns, 1 /* version */, sizeof(*pThis), ioapicSaveExec, ioapicLoadExec);
+    rc = PDMDevHlpSSMRegister(pDevIns, IOAPIC_SAVED_STATE_VERSION_VBOX_50, sizeof(*pThis),
+                              ioapicSaveExec, ioapicLoadExec);
     if (RT_FAILURE(rc))
         return rc;