commit d8e4633d3d79959e08bd812cb786e4cd1863f4aa
author David 'Digit' Turner <digit@google.com> Wed Apr 16 09:18:37 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 18 15:31:40 2014 +0200
tree 1fd300ed5831d1b2cd565cc83f54a233b680a164
parent 94299e645f74d5658cb9ef2aa7f74fb2de546bbe

hw/intc/ioapic.c: Convert to VMStateDescription.

Change-Id: I1d648191c9b38d82bd2c6f89eb4f13f48a6c8c89

hw/intc/ioapic.c

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index aff9b9c..5caecbe 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -192,33 +192,17 @@
     }
 }
 
-static void ioapic_save(QEMUFile *f, void *opaque)
-{
-    IOAPICState *s = opaque;
-    int i;
-
-    qemu_put_8s(f, &s->id);
-    qemu_put_8s(f, &s->ioregsel);
-    for (i = 0; i < IOAPIC_NUM_PINS; i++) {
-        qemu_put_be64s(f, &s->ioredtbl[i]);
+static const VMStateDescription vmstate_ioapic = {
+    .name = "ioapic",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .fields = (VMStateField []) {
+        VMSTATE_UINT8(id, IOAPICState),
+        VMSTATE_UINT8(ioregsel, IOAPICState),
+        VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS),
+        VMSTATE_END_OF_LIST()
     }
-}
-
-static int ioapic_load(QEMUFile *f, void *opaque, int version_id)
-{
-    IOAPICState *s = opaque;
-    int i;
-
-    if (version_id != 1)
-        return -EINVAL;
-
-    qemu_get_8s(f, &s->id);
-    qemu_get_8s(f, &s->ioregsel);
-    for (i = 0; i < IOAPIC_NUM_PINS; i++) {
-        qemu_get_be64s(f, &s->ioredtbl[i]);
-    }
-    return 0;
-}
+};
 
 static void ioapic_reset(void *opaque)
 {
@@ -254,7 +238,7 @@
                                        ioapic_mem_write, s);
     cpu_register_physical_memory(0xfec00000, 0x1000, io_memory);
 
-    register_savevm(NULL, "ioapic", 0, 1, ioapic_save, ioapic_load, s);
+    vmstate_register(NULL, 0, &vmstate_ioapic, s);
     qemu_register_reset(ioapic_reset, 0, s);
 
     return s;