diff options
| author | Philippe Mathieu-Daudé | 2021-05-17 12:51:28 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-05-27 00:33:59 +0200 |
| commit | 4336073b9b13943e050edfe9aebb99974c3b6ee1 (patch) | |
| tree | f4a2f44855ad29dad392f2013dac2f3cadd41a71 /target/sh4 | |
| parent | cpu: Directly use get_memory_mapping() fallback handlers in place (diff) | |
| download | qemu-4336073b9b13943e050edfe9aebb99974c3b6ee1.tar.gz qemu-4336073b9b13943e050edfe9aebb99974c3b6ee1.tar.xz qemu-4336073b9b13943e050edfe9aebb99974c3b6ee1.zip | |
cpu: Assert DeviceClass::vmsd is NULL on user emulation
Migration is specific to system emulation.
Restrict current DeviceClass::vmsd to sysemu using #ifdef'ry,
and assert in cpu_exec_realizefn() that dc->vmsd not set under
user emulation.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210517105140.1062037-12-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/sh4')
| -rw-r--r-- | target/sh4/cpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index ac65c88f1f..35d4251aaf 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -218,10 +218,12 @@ static void superh_cpu_initfn(Object *obj) env->movcal_backup_tail = &(env->movcal_backup); } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_sh_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif #include "hw/core/tcg-cpu-ops.h" @@ -257,12 +259,11 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_write_register = superh_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = superh_cpu_get_phys_page_debug; + dc->vmsd = &vmstate_sh_cpu; #endif cc->disas_set_info = superh_cpu_disas_set_info; cc->gdb_num_core_regs = 59; - - dc->vmsd = &vmstate_sh_cpu; cc->tcg_ops = &superh_tcg_ops; } |