From 20b0a9f4f6bbe41aaadf6681c16ac73d289203e1 Mon Sep 17 00:00:00 2001 From: Claudio Fontana Date: Tue, 8 Sep 2020 10:59:07 +0200 Subject: [PATCH] accel/tcg: use current_machine as it is always set for softmmu current_machine is always set before accelerators are initialized, so use that instead of MACHINE(qdev_get_machine()). Signed-off-by: Claudio Fontana Signed-off-by: Paolo Bonzini --- accel/tcg/tcg-cpus.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/accel/tcg/tcg-cpus.c b/accel/tcg/tcg-cpus.c index cedd1e6c4f..da1c63d8f6 100644 --- a/accel/tcg/tcg-cpus.c +++ b/accel/tcg/tcg-cpus.c @@ -479,16 +479,7 @@ static void tcg_start_vcpu_thread(CPUState *cpu) if (!tcg_region_inited) { tcg_region_inited = 1; tcg_region_init(); - /* - * If MTTCG, and we will create multiple cpus, - * then we will have cpus running in parallel. - */ - if (qemu_tcg_mttcg_enabled()) { - MachineState *ms = MACHINE(qdev_get_machine()); - if (ms->smp.max_cpus > 1) { - parallel_cpus = true; - } - } + parallel_cpus = qemu_tcg_mttcg_enabled() && current_machine->smp.max_cpus > 1; } if (qemu_tcg_mttcg_enabled() || !single_tcg_cpu_thread) {