[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/23] Port apic to new VMState design
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/23] Port apic to new VMState design |
Date: |
Thu, 20 Aug 2009 19:42:28 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/apic.c | 67 ++++++++++++++++++++++++++++++-------------------------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/hw/apic.c b/hw/apic.c
index 1927811..141c5f2 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -864,39 +864,8 @@ 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]);
- }
- 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)
+/* This function is only used for old state version 1 and 2 */
+static int apic_load_old(QEMUFile *f, void *opaque, int version_id)
{
APICState *s = opaque;
int i;
@@ -934,6 +903,36 @@ static int apic_load(QEMUFile *f, void *opaque, int
version_id)
return 0;
}
+static const VMStateDescription vmstate_apic = {
+ .name = "apic",
+ .version_id = 3,
+ .minimum_version_id = 3,
+ .minimum_version_id_old = 1,
+ .load_state_old = apic_load_old,
+ .fields = (VMStateField []) {
+ VMSTATE_UINT32(apicbase, APICState),
+ VMSTATE_UINT8(id, APICState),
+ VMSTATE_UINT8(arb_id, APICState),
+ VMSTATE_UINT8(tpr, APICState),
+ VMSTATE_UINT32(spurious_vec, APICState),
+ VMSTATE_UINT8(log_dest, APICState),
+ VMSTATE_UINT8(dest_mode, APICState),
+ VMSTATE_UINT32_ARRAY(isr, APICState, 8),
+ VMSTATE_UINT32_ARRAY(tmr, APICState, 8),
+ VMSTATE_UINT32_ARRAY(irr, APICState, 8),
+ VMSTATE_UINT32_ARRAY(lvt, APICState, APIC_LVT_NB),
+ VMSTATE_UINT32(esr, APICState),
+ VMSTATE_UINT32_ARRAY(icr, APICState, 2),
+ VMSTATE_UINT32(divide_conf, APICState),
+ VMSTATE_INT32(count_shift, APICState),
+ VMSTATE_UINT32(initial_count, APICState),
+ VMSTATE_INT64(initial_count_load_time, APICState),
+ VMSTATE_INT64(next_time, APICState),
+ VMSTATE_TIMER(timer, APICState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void apic_reset(void *opaque)
{
APICState *s = opaque;
@@ -996,7 +995,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
- [Qemu-devel] [PATCH 01/23] move useful type definitons to osdep.h, (continued)
- [Qemu-devel] [PATCH 01/23] move useful type definitons to osdep.h, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 02/23] split do_loadvm() into do_loadvm() and load_vmstate(), Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 03/23] move do_loadvm() to monitor.c, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 04/23] make load_vmstate() return errors, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 06/23] Add vmstate_load() and vmstate_save() functions, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 05/23] Use return value from load_state() call back, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 07/23] New VMstate save/load infrastructure, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 08/23] Add VMState support for pointers, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 09/23] Add VMState support for arrays, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 11/23] Add VMState support for structs, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 10/23] Port apic to new VMState design,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/23] Add VMState support for arrays of structs, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 13/23] Port i8254 to new VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 15/23] Add VMState support for variable sized arrays, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 16/23] Port PCI Bus to VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 14/23] Add VMState support for int32_t check value, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 18/23] Port PS2 devices to VMState design, Juan Quintela, 2009/08/20
- [Qemu-devel] [PATCH 17/23] Add VMState support for static sized buffers (uint_8), Juan Quintela, 2009/08/20