From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, qemu-riscv@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, "Juan Quintela" <quintela@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Laurent Vivier" <laurent@vivier.eu>, "Max Filippov" <jcmvbkbc@gmail.com>, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, "Claudio Fontana" <cfontana@suse.de>, "Guan Xuetao" <gxt@mprc.pku.edu.cn>, "Philippe Mathieu-Daudé" <f4bug@amsat.org> Subject: [PATCH v6 06/18] cpu: Assert DeviceClass::vmsd is NULL on user emulation Date: Thu, 22 Apr 2021 21:38:50 +0200 [thread overview] Message-ID: <20210422193902.2644064-7-f4bug@amsat.org> (raw) In-Reply-To: <20210422193902.2644064-1-f4bug@amsat.org> 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> --- cpu.c | 1 + target/sh4/cpu.c | 5 +++-- target/unicore32/cpu.c | 4 ++++ target/xtensa/cpu.c | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cpu.c b/cpu.c index bfbe5a66f95..4fed04219df 100644 --- a/cpu.c +++ b/cpu.c @@ -138,6 +138,7 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) #endif /* CONFIG_TCG */ #ifdef CONFIG_USER_ONLY + assert(qdev_get_vmsd(DEVICE(cpu)) == NULL); assert(cc->vmsd == NULL); #else if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index ac65c88f1f8..35d4251aaf3 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; } diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 0258884f845..a74ac7b6140 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -115,10 +115,12 @@ static void uc32_cpu_initfn(Object *obj) #endif } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_uc32_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif #include "hw/core/tcg-cpu-ops.h" @@ -146,7 +148,9 @@ static void uc32_cpu_class_init(ObjectClass *oc, void *data) cc->dump_state = uc32_cpu_dump_state; cc->set_pc = uc32_cpu_set_pc; cc->get_phys_page_debug = uc32_cpu_get_phys_page_debug; +#ifndef CONFIG_USER_ONLY dc->vmsd = &vmstate_uc32_cpu; +#endif cc->tcg_ops = &uc32_tcg_ops; } diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index e2b2c7a71c1..a66527e2d45 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -176,10 +176,12 @@ static void xtensa_cpu_initfn(Object *obj) #endif } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_xtensa_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif #include "hw/core/tcg-cpu-ops.h" @@ -216,9 +218,9 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_stop_before_watchpoint = true; #ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = xtensa_cpu_get_phys_page_debug; + dc->vmsd = &vmstate_xtensa_cpu; #endif cc->disas_set_info = xtensa_cpu_disas_set_info; - dc->vmsd = &vmstate_xtensa_cpu; cc->tcg_ops = &xtensa_tcg_ops; } -- 2.26.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>, qemu-riscv@nongnu.org, "Juan Quintela" <quintela@redhat.com>, "Peter Maydell" <peter.maydell@linaro.org>, "Claudio Fontana" <cfontana@suse.de>, qemu-arm@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>, qemu-ppc@nongnu.org, "Richard Henderson" <richard.henderson@linaro.org>, "Laurent Vivier" <laurent@vivier.eu>, qemu-s390x@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, "Guan Xuetao" <gxt@mprc.pku.edu.cn>, "Max Filippov" <jcmvbkbc@gmail.com> Subject: [PATCH v6 06/18] cpu: Assert DeviceClass::vmsd is NULL on user emulation Date: Thu, 22 Apr 2021 21:38:50 +0200 [thread overview] Message-ID: <20210422193902.2644064-7-f4bug@amsat.org> (raw) In-Reply-To: <20210422193902.2644064-1-f4bug@amsat.org> 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> --- cpu.c | 1 + target/sh4/cpu.c | 5 +++-- target/unicore32/cpu.c | 4 ++++ target/xtensa/cpu.c | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cpu.c b/cpu.c index bfbe5a66f95..4fed04219df 100644 --- a/cpu.c +++ b/cpu.c @@ -138,6 +138,7 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) #endif /* CONFIG_TCG */ #ifdef CONFIG_USER_ONLY + assert(qdev_get_vmsd(DEVICE(cpu)) == NULL); assert(cc->vmsd == NULL); #else if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index ac65c88f1f8..35d4251aaf3 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; } diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 0258884f845..a74ac7b6140 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -115,10 +115,12 @@ static void uc32_cpu_initfn(Object *obj) #endif } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_uc32_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif #include "hw/core/tcg-cpu-ops.h" @@ -146,7 +148,9 @@ static void uc32_cpu_class_init(ObjectClass *oc, void *data) cc->dump_state = uc32_cpu_dump_state; cc->set_pc = uc32_cpu_set_pc; cc->get_phys_page_debug = uc32_cpu_get_phys_page_debug; +#ifndef CONFIG_USER_ONLY dc->vmsd = &vmstate_uc32_cpu; +#endif cc->tcg_ops = &uc32_tcg_ops; } diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index e2b2c7a71c1..a66527e2d45 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -176,10 +176,12 @@ static void xtensa_cpu_initfn(Object *obj) #endif } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_xtensa_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif #include "hw/core/tcg-cpu-ops.h" @@ -216,9 +218,9 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_stop_before_watchpoint = true; #ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = xtensa_cpu_get_phys_page_debug; + dc->vmsd = &vmstate_xtensa_cpu; #endif cc->disas_set_info = xtensa_cpu_disas_set_info; - dc->vmsd = &vmstate_xtensa_cpu; cc->tcg_ops = &xtensa_tcg_ops; } -- 2.26.3
next prev parent reply other threads:[~2021-04-22 19:50 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-22 19:38 [PATCH v6 00/18] cpu: Introduce SysemuCPUOps structure Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 01/18] cpu: Un-inline cpu_get_phys_page_debug and cpu_asidx_from_attrs Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 02/18] cpu: Introduce cpu_virtio_is_big_endian() Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 03/18] cpu: Directly use cpu_write_elf*() fallback handlers in place Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 04/18] cpu: Directly use get_paging_enabled() " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 05/18] cpu: Directly use get_memory_mapping() " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé [this message] 2021-04-22 19:38 ` [PATCH v6 06/18] cpu: Assert DeviceClass::vmsd is NULL on user emulation Philippe Mathieu-Daudé 2021-04-23 1:08 ` Richard Henderson 2021-04-23 1:08 ` Richard Henderson 2021-04-26 16:15 ` Dr. David Alan Gilbert 2021-04-26 16:15 ` Dr. David Alan Gilbert 2021-04-26 16:50 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 07/18] cpu: Rename CPUClass vmsd -> legacy_vmsd Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-23 1:11 ` Richard Henderson 2021-04-23 1:11 ` Richard Henderson 2021-04-22 19:38 ` [PATCH v6 08/18] cpu/{avr, lm32, moxie}: Set DeviceClass vmsd field (not CPUClass one) Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-23 1:16 ` Richard Henderson 2021-04-23 1:16 ` Richard Henderson 2021-05-17 5:27 ` Philippe Mathieu-Daudé 2021-05-17 5:27 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 09/18] cpu: Introduce SysemuCPUOps structure Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 10/18] cpu: Move CPUClass::vmsd to SysemuCPUOps Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-23 1:24 ` Richard Henderson 2021-04-23 1:24 ` Richard Henderson 2021-04-22 19:38 ` [PATCH v6 11/18] cpu: Move CPUClass::virtio_is_big_endian " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 12/18] cpu: Move CPUClass::get_crash_info " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 13/18] cpu: Move CPUClass::write_elf* " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 14/18] cpu: Move CPUClass::asidx_from_attrs " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:38 ` [PATCH v6 15/18] cpu: Move CPUClass::get_phys_page_debug " Philippe Mathieu-Daudé 2021-04-22 19:38 ` Philippe Mathieu-Daudé 2021-04-22 19:39 ` [PATCH v6 16/18] cpu: Move CPUClass::get_memory_mapping " Philippe Mathieu-Daudé 2021-04-22 19:39 ` Philippe Mathieu-Daudé 2021-04-22 19:39 ` [PATCH v6 17/18] cpu: Move CPUClass::get_paging_enabled " Philippe Mathieu-Daudé 2021-04-22 19:39 ` Philippe Mathieu-Daudé 2021-04-22 19:39 ` [PATCH v6 18/18] cpu: Restrict "hw/core/sysemu-cpu-ops.h" to target/cpu.c Philippe Mathieu-Daudé 2021-04-22 19:39 ` Philippe Mathieu-Daudé
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210422193902.2644064-7-f4bug@amsat.org \ --to=f4bug@amsat.org \ --cc=cfontana@suse.de \ --cc=dgilbert@redhat.com \ --cc=ehabkost@redhat.com \ --cc=gxt@mprc.pku.edu.cn \ --cc=jcmvbkbc@gmail.com \ --cc=laurent@vivier.eu \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=quintela@redhat.com \ --cc=richard.henderson@linaro.org \ --cc=ysato@users.sourceforge.jp \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.