diff options
author | Andreas Färber <afaerber@suse.de> | 2013-01-21 00:27:16 +0100 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-06-28 13:25:12 +0200 |
commit | fe31e7374299c0c6172ce618b29bf2fecbd881c7 (patch) | |
tree | 3ce0517adea6b6c091d78c3bd368824537a7a3b9 /target-alpha | |
parent | 1a1562f5ea3da17d45d3829e35b5f49da9ec2db5 (diff) | |
download | qemu-fe31e7374299c0c6172ce618b29bf2fecbd881c7.zip qemu-fe31e7374299c0c6172ce618b29bf2fecbd881c7.tar.gz qemu-fe31e7374299c0c6172ce618b29bf2fecbd881c7.tar.bz2 |
target-alpha: Register VMStateDescription for AlphaCPU
Commit b758aca1f6cdb175634812b79f5560c36c902d00 (target-alpha: Enable
the alpha-softmmu target.) introduced cpu_{save,load}() functions but
didn't define CPU_SAVE_VERSION, so they were never registered.
Drop cpu_{save,load}() and register the VMStateDescription via DeviceClass.
This operates on the AlphaCPU object instead of CPUAlphaState.
Reviewed-by: Juan Quintela <quintela@redhat.com>
Acked-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-alpha')
-rw-r--r-- | target-alpha/cpu-qom.h | 4 | ||||
-rw-r--r-- | target-alpha/cpu.c | 2 | ||||
-rw-r--r-- | target-alpha/machine.c | 28 |
3 files changed, 22 insertions, 12 deletions
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index 32ee286..ee10ed6 100644 --- a/target-alpha/cpu-qom.h +++ b/target-alpha/cpu-qom.h @@ -74,6 +74,10 @@ static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) #define ENV_OFFSET offsetof(AlphaCPU, env) +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vmstate_alpha_cpu; +#endif + void alpha_cpu_do_interrupt(CPUState *cpu); #endif diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c index cad1716..8252cea 100644 --- a/target-alpha/cpu.c +++ b/target-alpha/cpu.c @@ -21,6 +21,7 @@ #include "cpu.h" #include "qemu-common.h" +#include "migration/vmstate.h" static void alpha_cpu_realizefn(DeviceState *dev, Error **errp) @@ -264,6 +265,7 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = alpha_cpu_class_by_name; cc->do_interrupt = alpha_cpu_do_interrupt; + device_class_set_vmsd(dc, &vmstate_alpha_cpu); } static const TypeInfo alpha_cpu_type_info = { diff --git a/target-alpha/machine.c b/target-alpha/machine.c index 1c9edd1..889f2fc 100644 --- a/target-alpha/machine.c +++ b/target-alpha/machine.c @@ -20,7 +20,7 @@ static const VMStateInfo vmstate_fpcr = { .put = put_fpcr, }; -static VMStateField vmstate_cpu_fields[] = { +static VMStateField vmstate_env_fields[] = { VMSTATE_UINTTL_ARRAY(ir, CPUAlphaState, 31), VMSTATE_UINTTL_ARRAY(fir, CPUAlphaState, 31), /* Save the architecture value of the fpcr, not the internally @@ -68,20 +68,24 @@ static VMStateField vmstate_cpu_fields[] = { VMSTATE_END_OF_LIST() }; -static const VMStateDescription vmstate_cpu = { - .name = "cpu", +static const VMStateDescription vmstate_env = { + .name = "env", .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, - .fields = vmstate_cpu_fields, + .fields = vmstate_env_fields, }; -void cpu_save(QEMUFile *f, void *opaque) -{ - vmstate_save_state(f, &vmstate_cpu, opaque); -} +static VMStateField vmstate_cpu_fields[] = { + VMSTATE_CPU(), + VMSTATE_STRUCT(env, AlphaCPU, 1, vmstate_env, CPUAlphaState), + VMSTATE_END_OF_LIST() +}; -int cpu_load(QEMUFile *f, void *opaque, int version_id) -{ - return vmstate_load_state(f, &vmstate_cpu, opaque, version_id); -} +const VMStateDescription vmstate_alpha_cpu = { + .name = "cpu", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = vmstate_cpu_fields, +}; |