mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-moxie: Fix VMState registration

Browse Source 
Register the CPU VMState in the correct way, via cpu_class_set_vmsd(),
rather than doing it in two different wrong ways (once by providing
cpu_save and cpu_load functions, and once by setting the vmsd field in
DeviceClass).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Peter Maydell 2013-04-08 16:51:46 +01:00 committed by Stefan Hajnoczi
parent 93b48c201e
commit 183543cdb6
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-moxie/cpu.c
View File

@ -97,7 +97,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)
cc->class_by_name = moxie_cpu_class_by_name; cc->class_by_name = moxie_cpu_class_by_name;
dc->vmsd = &vmstate_moxie_cpu; cpu_class_set_vmsd(cc, &vmstate_moxie_cpu);
cc->do_interrupt = moxie_cpu_do_interrupt; cc->do_interrupt = moxie_cpu_do_interrupt;
} }

2
target-moxie/cpu.h
View File

@ -28,8 +28,6 @@
#define TARGET_HAS_ICE 1 #define TARGET_HAS_ICE 1
#define CPU_SAVE_VERSION 1
#define ELF_MACHINE 0xFEED /* EM_MOXIE */ #define ELF_MACHINE 0xFEED /* EM_MOXIE */
#define MOXIE_EX_DIV0 0 #define MOXIE_EX_DIV0 0

12
target-moxie/machine.c
View File

@ -3,7 +3,7 @@
const VMStateDescription vmstate_moxie_cpu = { const VMStateDescription vmstate_moxie_cpu = {
.name = "cpu", .name = "cpu",
.version_id = CPU_SAVE_VERSION, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
@ -16,13 +16,3 @@ const VMStateDescription vmstate_moxie_cpu = {
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
void cpu_save(QEMUFile *f, void *opaque)
{
vmstate_save_state(f, &vmstate_moxie_cpu, opaque);
}
int cpu_load(QEMUFile *f, void *opaque, int version_id)
{
return vmstate_load_state(f, &vmstate_moxie_cpu, opaque, version_id);
}