summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-04-08 16:51:46 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2013-04-12 14:30:39 +0200
commit183543cdb68a0f2e1ff1c68d37338037dcc9d6c5 (patch)
treeb3f6678d5b22c7be09ae663442d251c433c17461
parent93b48c201eb6c0404d15550a0eaa3c0f7937e35e (diff)
downloadhqemu-183543cdb68a0f2e1ff1c68d37338037dcc9d6c5.zip
hqemu-183543cdb68a0f2e1ff1c68d37338037dcc9d6c5.tar.gz
target-moxie: Fix VMState registration
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>
-rw-r--r--target-moxie/cpu.c2
-rw-r--r--target-moxie/cpu.h2
-rw-r--r--target-moxie/machine.c12
3 files changed, 2 insertions, 14 deletions
diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index c0855f0..f2b0791 100644
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -97,7 +97,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data)
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;
}
diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h
index 988729a..a9d9ace 100644
--- a/target-moxie/cpu.h
+++ b/target-moxie/cpu.h
@@ -28,8 +28,6 @@
#define TARGET_HAS_ICE 1
-#define CPU_SAVE_VERSION 1
-
#define ELF_MACHINE 0xFEED /* EM_MOXIE */
#define MOXIE_EX_DIV0 0
diff --git a/target-moxie/machine.c b/target-moxie/machine.c
index 5bfdb28..0f5992b 100644
--- a/target-moxie/machine.c
+++ b/target-moxie/machine.c
@@ -3,7 +3,7 @@
const VMStateDescription vmstate_moxie_cpu = {
.name = "cpu",
- .version_id = CPU_SAVE_VERSION,
+ .version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
.fields = (VMStateField[]) {
@@ -16,13 +16,3 @@ const VMStateDescription vmstate_moxie_cpu = {
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);
-}
OpenPOWER on IntegriCloud