[v3] user-mode: Prune build dependencies (part 1)

[PATCH v3 08/12] exec: Assert CPU migration is not used on user-only build

Posted by Philippe Mathieu-Daudé 5 years, 9 months ago

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 exec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exec.c b/exec.c
index 2874bb5088..3a39ffb1eb 100644
--- a/exec.c
+++ b/exec.c
@@ -946,7 +946,9 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)
 
     qemu_plugin_vcpu_init_hook(cpu);
 
-#ifndef CONFIG_USER_ONLY
+#ifdef CONFIG_USER_ONLY
+    assert(cc->vmsd == NULL);
+#else /* !CONFIG_USER_ONLY */
     if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
         vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu);
     }
-- 
2.21.3

Re: [PATCH v3 08/12] exec: Assert CPU migration is not used on user-only build

Posted by Alistair Francis 5 years, 9 months ago

On Mon, May 4, 2020 at 8:41 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  exec.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/exec.c b/exec.c
> index 2874bb5088..3a39ffb1eb 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -946,7 +946,9 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)
>
>      qemu_plugin_vcpu_init_hook(cpu);
>
> -#ifndef CONFIG_USER_ONLY
> +#ifdef CONFIG_USER_ONLY
> +    assert(cc->vmsd == NULL);
> +#else /* !CONFIG_USER_ONLY */
>      if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
>          vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu);
>      }
> --
> 2.21.3
>
>