[v8] QEMU cpus.c refactoring part2

[PATCH v8 17/17] accel/tcg: use current_machine as it is always set for softmmu

Posted by Claudio Fontana 5 years, 4 months ago

current_machine is always set before accelerators are initialized,
so use that instead of MACHINE(qdev_get_machine()).

Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 accel/tcg/tcg-cpus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accel/tcg/tcg-cpus.c b/accel/tcg/tcg-cpus.c
index ec7158b55e..05af1168a2 100644
--- a/accel/tcg/tcg-cpus.c
+++ b/accel/tcg/tcg-cpus.c
@@ -484,7 +484,7 @@ static void tcg_start_vcpu_thread(CPUState *cpu)
          * then we will have cpus running in parallel.
          */
         if (qemu_tcg_mttcg_enabled()) {
-            MachineState *ms = MACHINE(qdev_get_machine());
+            MachineState *ms = current_machine;
             if (ms->smp.max_cpus > 1) {
                 parallel_cpus = true;
             }
-- 
2.26.2

Re: [PATCH v8 17/17] accel/tcg: use current_machine as it is always set for softmmu

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

On 9/16/20 4:20 PM, Claudio Fontana wrote:
> current_machine is always set before accelerators are initialized,
> so use that instead of MACHINE(qdev_get_machine()).
> 
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
>  accel/tcg/tcg-cpus.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/accel/tcg/tcg-cpus.c b/accel/tcg/tcg-cpus.c
> index ec7158b55e..05af1168a2 100644
> --- a/accel/tcg/tcg-cpus.c
> +++ b/accel/tcg/tcg-cpus.c
> @@ -484,7 +484,7 @@ static void tcg_start_vcpu_thread(CPUState *cpu)
>           * then we will have cpus running in parallel.
>           */
>          if (qemu_tcg_mttcg_enabled()) {
> -            MachineState *ms = MACHINE(qdev_get_machine());
> +            MachineState *ms = current_machine;
>              if (ms->smp.max_cpus > 1) {

What about simply using:

               if (current_machine->smp.max_cpus > 1) {

>                  parallel_cpus = true;
>              }
> 

Regardless:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>