[Qemu-devel] [PATCH 5/5] Port apic to new VMState design

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 hw/apic.c |   96 +++++++++++++++++-------------------------------------------
 1 files changed, 27 insertions(+), 69 deletions(-)

diff --git a/hw/apic.c b/hw/apic.c
index 1927811..2c1dbf4 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -864,75 +864,33 @@ static void apic_mem_writel(void *opaque, 
target_phys_addr_t addr, uint32_t val)
     }
 }

-static void apic_save(QEMUFile *f, void *opaque)
-{
-    APICState *s = opaque;
-    int i;
-
-    qemu_put_be32s(f, &s->apicbase);
-    qemu_put_8s(f, &s->id);
-    qemu_put_8s(f, &s->arb_id);
-    qemu_put_8s(f, &s->tpr);
-    qemu_put_be32s(f, &s->spurious_vec);
-    qemu_put_8s(f, &s->log_dest);
-    qemu_put_8s(f, &s->dest_mode);
-    for (i = 0; i < 8; i++) {
-        qemu_put_be32s(f, &s->isr[i]);
-        qemu_put_be32s(f, &s->tmr[i]);
-        qemu_put_be32s(f, &s->irr[i]);
-    }
-    for (i = 0; i < APIC_LVT_NB; i++) {
-        qemu_put_be32s(f, &s->lvt[i]);
+static VMStateDescription vmstate_apic = {
+    .name = "apic",
+    .version_id = 3,
+    .minimum_version_id = 3,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT32(apicbase, APICState, 0),
+        VMSTATE_UINT8(id, APICState, 0),
+        VMSTATE_UINT8(arb_id, APICState, 0),
+        VMSTATE_UINT8(tpr, APICState, 0),
+        VMSTATE_UINT32(spurious_vec, APICState, 0),
+        VMSTATE_UINT8(log_dest, APICState, 0),
+        VMSTATE_UINT8(dest_mode, APICState, 0),
+        VMSTATE_UINT32_ARRAY(isr, APICState, 0, 8),
+        VMSTATE_UINT32_ARRAY(tmr, APICState, 0, 8),
+        VMSTATE_UINT32_ARRAY(irr, APICState, 0, 8),
+        VMSTATE_UINT32_ARRAY(lvt, APICState, 0, APIC_LVT_NB),
+        VMSTATE_UINT32(esr, APICState, 0),
+        VMSTATE_UINT32_ARRAY(icr, APICState, 0, 2),
+        VMSTATE_UINT32(divide_conf, APICState, 0),
+        VMSTATE_INT32(count_shift, APICState, 0),
+        VMSTATE_UINT32(initial_count, APICState, 0),
+        VMSTATE_INT64(initial_count_load_time, APICState, 0),
+        VMSTATE_INT64(next_time, APICState, 0),
+        VMSTATE_TIMER(timer, APICState, 2),
+        VMSTATE_END_OF_LIST()
     }
-    qemu_put_be32s(f, &s->esr);
-    qemu_put_be32s(f, &s->icr[0]);
-    qemu_put_be32s(f, &s->icr[1]);
-    qemu_put_be32s(f, &s->divide_conf);
-    qemu_put_be32(f, s->count_shift);
-    qemu_put_be32s(f, &s->initial_count);
-    qemu_put_be64(f, s->initial_count_load_time);
-    qemu_put_be64(f, s->next_time);
-
-    qemu_put_timer(f, s->timer);
-}
-
-static int apic_load(QEMUFile *f, void *opaque, int version_id)
-{
-    APICState *s = opaque;
-    int i;
-
-    if (version_id > 2)
-        return -EINVAL;
-
-    /* XXX: what if the base changes? (registered memory regions) */
-    qemu_get_be32s(f, &s->apicbase);
-    qemu_get_8s(f, &s->id);
-    qemu_get_8s(f, &s->arb_id);
-    qemu_get_8s(f, &s->tpr);
-    qemu_get_be32s(f, &s->spurious_vec);
-    qemu_get_8s(f, &s->log_dest);
-    qemu_get_8s(f, &s->dest_mode);
-    for (i = 0; i < 8; i++) {
-        qemu_get_be32s(f, &s->isr[i]);
-        qemu_get_be32s(f, &s->tmr[i]);
-        qemu_get_be32s(f, &s->irr[i]);
-    }
-    for (i = 0; i < APIC_LVT_NB; i++) {
-        qemu_get_be32s(f, &s->lvt[i]);
-    }
-    qemu_get_be32s(f, &s->esr);
-    qemu_get_be32s(f, &s->icr[0]);
-    qemu_get_be32s(f, &s->icr[1]);
-    qemu_get_be32s(f, &s->divide_conf);
-    s->count_shift=qemu_get_be32(f);
-    qemu_get_be32s(f, &s->initial_count);
-    s->initial_count_load_time=qemu_get_be64(f);
-    s->next_time=qemu_get_be64(f);
-
-    if (version_id >= 2)
-        qemu_get_timer(f, s->timer);
-    return 0;
-}
+};

 static void apic_reset(void *opaque)
 {
@@ -996,7 +954,7 @@ int apic_init(CPUState *env)
     }
     s->timer = qemu_new_timer(vm_clock, apic_timer, s);

-    register_savevm("apic", s->idx, 2, apic_save, apic_load, s);
+    vmstate_register(s->idx, &vmstate_apic, s);
     qemu_register_reset(apic_reset, s);

     local_apics[s->idx] = s;
-- 
1.6.2.5