[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 4/9] integratorcp: adding vmstate for save/restor
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v8 4/9] integratorcp: adding vmstate for save/restore |
Date: |
Thu, 26 Jan 2017 15:34:34 +0300 |
User-agent: |
StGit/0.16 |
From: Pavel Dovgalyuk <address@hidden>
VMState added by this patch preserves correct
loading of the integratorcp device state.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
hw/arm/integratorcp.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 039812a..ca06e1b 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -53,6 +53,27 @@ static uint8_t integrator_spd[128] = {
0xe, 4, 0x1c, 1, 2, 0x20, 0xc0, 0, 0, 0, 0, 0x30, 0x28, 0x30, 0x28, 0x40
};
+static const VMStateDescription vmstate_integratorcm = {
+ .name = "integratorcm",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(cm_osc, IntegratorCMState),
+ VMSTATE_UINT32(cm_ctrl, IntegratorCMState),
+ VMSTATE_UINT32(cm_lock, IntegratorCMState),
+ VMSTATE_UINT32(cm_auxosc, IntegratorCMState),
+ VMSTATE_UINT32(cm_sdram, IntegratorCMState),
+ VMSTATE_UINT32(cm_init, IntegratorCMState),
+ VMSTATE_UINT32(cm_flags, IntegratorCMState),
+ VMSTATE_UINT32(cm_nvflags, IntegratorCMState),
+ VMSTATE_UINT32(int_level, IntegratorCMState),
+ VMSTATE_UINT32(irq_enabled, IntegratorCMState),
+ VMSTATE_UINT32(fiq_enabled, IntegratorCMState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static uint64_t integratorcm_read(void *opaque, hwaddr offset,
unsigned size)
{
@@ -309,6 +330,19 @@ typedef struct icp_pic_state {
qemu_irq parent_fiq;
} icp_pic_state;
+static const VMStateDescription vmstate_icp_pic = {
+ .name = "icp_pic",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(level, icp_pic_state),
+ VMSTATE_UINT32(irq_enabled, icp_pic_state),
+ VMSTATE_UINT32(fiq_enabled, icp_pic_state),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static void icp_pic_update(icp_pic_state *s)
{
uint32_t flags;
@@ -438,6 +472,17 @@ typedef struct ICPCtrlRegsState {
#define ICP_INTREG_WPROT (1 << 0)
#define ICP_INTREG_CARDIN (1 << 3)
+static const VMStateDescription vmstate_icp_control = {
+ .name = "icp_control",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(intreg_state, ICPCtrlRegsState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static uint64_t icp_control_read(void *opaque, hwaddr offset,
unsigned size)
{
@@ -640,6 +685,21 @@ static void core_class_init(ObjectClass *klass, void *data)
dc->props = core_properties;
dc->realize = integratorcm_realize;
+ dc->vmsd = &vmstate_integratorcm;
+}
+
+static void icp_pic_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->vmsd = &vmstate_icp_pic;
+}
+
+static void icp_control_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->vmsd = &vmstate_icp_control;
}
static const TypeInfo core_info = {
@@ -655,6 +715,7 @@ static const TypeInfo icp_pic_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(icp_pic_state),
.instance_init = icp_pic_init,
+ .class_init = icp_pic_class_init,
};
static const TypeInfo icp_ctrl_regs_info = {
@@ -662,6 +723,7 @@ static const TypeInfo icp_ctrl_regs_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ICPCtrlRegsState),
.instance_init = icp_control_init,
+ .class_init = icp_control_class_init,
};
static void integratorcp_register_types(void)
- Re: [Qemu-devel] [PATCH v8 2/9] icount: exit cpu loop on expire, (continued)
- Re: [Qemu-devel] [PATCH v8 2/9] icount: exit cpu loop on expire, Paolo Bonzini, 2017/01/26
- Re: [Qemu-devel] [PATCH v8 2/9] icount: exit cpu loop on expire, Pavel Dovgalyuk, 2017/01/26
- Re: [Qemu-devel] [PATCH v8 2/9] icount: exit cpu loop on expire, Paolo Bonzini, 2017/01/26
- Re: [Qemu-devel] [PATCH v8 2/9] icount: exit cpu loop on expire, Pavel Dovgalyuk, 2017/01/27
- Re: [Qemu-devel] [PATCH v8 2/9] icount: exit cpu loop on expire, Paolo Bonzini, 2017/01/27
[Qemu-devel] [PATCH v8 3/9] apic: save apic_delivered flag, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 4/9] integratorcp: adding vmstate for save/restore,
Pavel Dovgalyuk <=
[Qemu-devel] [PATCH v8 5/9] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 6/9] blkreplay: create temporary overlay for underlaying devices, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 7/9] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 8/9] audio: make audio poll timer deterministic, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 9/9] replay: add record/replay for audio passthrough, Pavel Dovgalyuk, 2017/01/26
Re: [Qemu-devel] [PATCH v8 0/9] replay additions, Paolo Bonzini, 2017/01/26