[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu for-1.4 2/6] target-microblaze: Mark as unmi
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu for-1.4 2/6] target-microblaze: Mark as unmigratable |
Date: |
Mon, 28 Jan 2013 01:13:05 +0100 |
cpu_{save,load} were no-ops, so de facto it is unmigratable and no
backwards compatibility to keep. Therefore mark the MicroBlazeCPU as
unmigratable at device level the QOM way and suppress "cpu_common"
VMState registration by dropping CPU_SAVE_VERSION.
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-microblaze/Makefile.objs | 2 +-
target-microblaze/cpu.c | 9 +++++++++
target-microblaze/cpu.h | 2 --
target-microblaze/machine.c | 11 -----------
4 Dateien geändert, 10 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-)
delete mode 100644 target-microblaze/machine.c
diff --git a/target-microblaze/Makefile.objs b/target-microblaze/Makefile.objs
index afb87bc..985330e 100644
--- a/target-microblaze/Makefile.objs
+++ b/target-microblaze/Makefile.objs
@@ -1,2 +1,2 @@
obj-y += translate.o op_helper.o helper.o cpu.o
-obj-$(CONFIG_SOFTMMU) += mmu.o machine.o
+obj-$(CONFIG_SOFTMMU) += mmu.o
diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
index 0f858fd..39230fd 100644
--- a/target-microblaze/cpu.c
+++ b/target-microblaze/cpu.c
@@ -22,6 +22,7 @@
#include "cpu.h"
#include "qemu-common.h"
+#include "migration/vmstate.h"
/* CPUClass::reset() */
@@ -94,13 +95,21 @@ static void mb_cpu_initfn(Object *obj)
set_float_rounding_mode(float_round_nearest_even, &env->fp_status);
}
+static const VMStateDescription vmstate_mb_cpu = {
+ .name = "cpu",
+ .unmigratable = 1,
+};
+
static void mb_cpu_class_init(ObjectClass *oc, void *data)
{
+ DeviceClass *dc = DEVICE_CLASS(oc);
CPUClass *cc = CPU_CLASS(oc);
MicroBlazeCPUClass *mcc = MICROBLAZE_CPU_CLASS(oc);
mcc->parent_reset = cc->reset;
cc->reset = mb_cpu_reset;
+
+ dc->vmsd = &vmstate_mb_cpu;
}
static const TypeInfo mb_cpu_type_info = {
diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 5621068..41480e7 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -307,8 +307,6 @@ static inline CPUMBState *cpu_init(const char *cpu_model)
#define cpu_gen_code cpu_mb_gen_code
#define cpu_signal_handler cpu_mb_signal_handler
-#define CPU_SAVE_VERSION 1
-
/* MMU modes definitions */
#define MMU_MODE0_SUFFIX _nommu
#define MMU_MODE1_SUFFIX _kernel
diff --git a/target-microblaze/machine.c b/target-microblaze/machine.c
deleted file mode 100644
index 1be1c35..0000000
--- a/target-microblaze/machine.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "hw/hw.h"
-#include "hw/boards.h"
-
-void cpu_save(QEMUFile *f, void *opaque)
-{
-}
-
-int cpu_load(QEMUFile *f, void *opaque, int version_id)
-{
- return 0;
-}
--
1.7.10.4
- [Qemu-devel] [PATCH qom-cpu for-1.4 0/6] Unmigratable CPUs for 1.4, Andreas Färber, 2013/01/27
- [Qemu-devel] [PATCH qom-cpu for-1.4 2/6] target-microblaze: Mark as unmigratable,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-cpu for-1.4 1/6] target-unicore32: Mark as unmigratable, Andreas Färber, 2013/01/27
- [Qemu-devel] [PATCH qom-cpu for-1.4 4/6] target-sh4: Mark as unmigratable, Andreas Färber, 2013/01/27
- [Qemu-devel] [PATCH qom-cpu for-1.4 5/6] target-s390x: Mark as unmigratable, Andreas Färber, 2013/01/27
- [Qemu-devel] [PATCH qom-cpu for-1.4 6/6] target-m68k: Mark as unmigratable, Andreas Färber, 2013/01/27
- [Qemu-devel] [PATCH qom-cpu for-1.4 3/6] target-xtensa: Mark as unmigratable, Andreas Färber, 2013/01/27
- Re: [Qemu-devel] [PATCH qom-cpu for-1.4 0/6] Unmigratable CPUs for 1.4, Andreas Färber, 2013/01/27
- Re: [Qemu-devel] [PATCH qom-cpu for-1.4 0/6] Unmigratable CPUs for 1.4, Juan Quintela, 2013/01/29