SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/riscv/cpu: Restrict CPU migration to system-mode

Browse Source 
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Tested-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200522172510.25784-8-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-22 19:25:04 +02:00 committed by Laurent Vivier
parent dc70f80fb2
commit 0c4e99317a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/riscv/cpu.c
View File

@ -485,10 +485,12 @@ static void riscv_cpu_init(Object *obj)
cpu_set_cpustate_pointers(cpu); cpu_set_cpustate_pointers(cpu);
} }
#ifndef CONFIG_USER_ONLY
static const VMStateDescription vmstate_riscv_cpu = { static const VMStateDescription vmstate_riscv_cpu = {
.name = "cpu", .name = "cpu",
.unmigratable = 1, .unmigratable = 1,
}; };
#endif
static Property riscv_cpu_properties[] = { static Property riscv_cpu_properties[] = {
DEFINE_PROP_BOOL("i", RISCVCPU, cfg.ext_i, true), DEFINE_PROP_BOOL("i", RISCVCPU, cfg.ext_i, true),
@ -544,13 +546,13 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)
cc->do_transaction_failed = riscv_cpu_do_transaction_failed; cc->do_transaction_failed = riscv_cpu_do_transaction_failed;
cc->do_unaligned_access = riscv_cpu_do_unaligned_access; cc->do_unaligned_access = riscv_cpu_do_unaligned_access;
cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug; cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug;
/* For now, mark unmigratable: */
cc->vmsd = &vmstate_riscv_cpu;
#endif #endif
#ifdef CONFIG_TCG #ifdef CONFIG_TCG
cc->tcg_initialize = riscv_translate_init; cc->tcg_initialize = riscv_translate_init;
cc->tlb_fill = riscv_cpu_tlb_fill; cc->tlb_fill = riscv_cpu_tlb_fill;
#endif #endif
/* For now, mark unmigratable: */
cc->vmsd = &vmstate_riscv_cpu;
device_class_set_props(dc, riscv_cpu_properties); device_class_set_props(dc, riscv_cpu_properties);
} }