mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
target-microblaze: Mark as unmigratable
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 <quintela@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
88e28512ef
commit
3ce8b2bcbf
4 changed files with 10 additions and 14 deletions
|
@ -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
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
Loading…
Reference in a new issue