Re: [PATCH v6 10/18] cpu: Move CPUClass::vmsd to SysemuCPUOps

[Richard Henderson]

On 4/22/21 12:38 PM, Philippe Mathieu-Daudé wrote:
> Migration is specific to system emulation.
>
> - Move the CPUClass::vmsd field to SysemuCPUOps,
> - restrict VMSTATE_CPU() macro to sysemu,
> - vmstate_dummy is now unused, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

>   #ifndef CONFIG_USER_ONLY
>   static const struct SysemuCPUOps riscv_sysemu_ops = {
> +    /* For now, mark unmigratable: */
> +    .legacy_vmsd = &vmstate_riscv_cpu,
>   };
>   #endif
>   
> @@ -628,8 +630,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)
>       cc->disas_set_info = riscv_cpu_disas_set_info;
>   #ifndef CONFIG_USER_ONLY
>       cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug;
> -    /* For now, mark unmigratable: */
> -    cc->legacy_vmsd = &vmstate_riscv_cpu;

I'll note that the comment has been incorrect since f7697f0e629.


r~

>       cc->sysemu_ops = &riscv_sysemu_ops;
>       cc->write_elf64_note = riscv_cpu_write_elf64_note;
>       cc->write_elf32_note = riscv_cpu_write_elf32_note;
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 7503b9e0c8b..131e7dfdf82 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -479,6 +479,7 @@ static void s390_cpu_reset_full(DeviceState *dev)
>   
>   #ifndef CONFIG_USER_ONLY
>   static const struct SysemuCPUOps s390_sysemu_ops = {
> +    .legacy_vmsd = &vmstate_s390_cpu,
>   };
>   #endif
>   
> @@ -522,7 +523,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
>       cc->gdb_write_register = s390_cpu_gdb_write_register;
>   #ifndef CONFIG_USER_ONLY
>       cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;
> -    cc->legacy_vmsd = &vmstate_s390_cpu;
>       cc->get_crash_info = s390_cpu_get_crash_info;
>       cc->write_elf64_note = s390_cpu_write_elf64_note;
>       cc->sysemu_ops = &s390_sysemu_ops;
> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
> index 743a7287a4f..543853c24dc 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -850,6 +850,7 @@ static Property sparc_cpu_properties[] = {
>   
>   #ifndef CONFIG_USER_ONLY
>   static const struct SysemuCPUOps sparc_sysemu_ops = {
> +    .legacy_vmsd = &vmstate_sparc_cpu,
>   };
>   #endif
>   
> @@ -894,7 +895,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data)
>       cc->gdb_write_register = sparc_cpu_gdb_write_register;
>   #ifndef CONFIG_USER_ONLY
>       cc->get_phys_page_debug = sparc_cpu_get_phys_page_debug;
> -    cc->legacy_vmsd = &vmstate_sparc_cpu;
>       cc->sysemu_ops = &sparc_sysemu_ops;
>   #endif
>       cc->disas_set_info = cpu_sparc_disas_set_info;
> diff --git a/target/ppc/translate_init.c.inc b/target/ppc/translate_init.c.inc
> index b15abc36851..e3f2f2fefa3 100644
> --- a/target/ppc/translate_init.c.inc
> +++ b/target/ppc/translate_init.c.inc
> @@ -10880,6 +10880,7 @@ static Property ppc_cpu_properties[] = {
>   
>   #ifndef CONFIG_USER_ONLY
>   static const struct SysemuCPUOps ppc_sysemu_ops = {
> +    .legacy_vmsd = &vmstate_ppc_cpu,
>   };
>   #endif
>   
> @@ -10925,7 +10926,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
>       cc->gdb_write_register = ppc_cpu_gdb_write_register;
>   #ifndef CONFIG_USER_ONLY
>       cc->get_phys_page_debug = ppc_cpu_get_phys_page_debug;
> -    cc->legacy_vmsd = &vmstate_ppc_cpu;
>       cc->sysemu_ops = &ppc_sysemu_ops;
>   #endif
>   #if defined(CONFIG_SOFTMMU)