Re: [PATCH v2 1/6] hw/core/cpu: Clean up global variable shadowing

[Ani Sinha]

> On 10-Oct-2023, at 5:20 PM, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> 
> Fix:
> 
>  hw/core/machine.c:1302:22: error: declaration shadows a variable in the 
> global scope [-Werror,-Wshadow]
>      const CPUArchId *cpus = possible_cpus->cpus;
>                       ^
>  hw/core/numa.c:69:17: error: declaration shadows a variable in the global 
> scope [-Werror,-Wshadow]
>      uint16List *cpus = NULL;
>                  ^
>  hw/acpi/aml-build.c:2005:20: error: declaration shadows a variable in the 
> global scope [-Werror,-Wshadow]
>      CPUArchIdList *cpus = ms->possible_cpus;
>                     ^
>  hw/core/machine-smp.c:77:14: error: declaration shadows a variable in the 
> global scope [-Werror,-Wshadow]
>      unsigned cpus    = config->has_cpus ? config->cpus : 0;
>               ^
>  include/hw/core/cpu.h:589:17: note: previous declaration is here
>  extern CPUTailQ cpus;
>                  ^
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Ani Sinha <anisinha@redhat.com>

> ---
> include/hw/core/cpu.h     | 8 ++++----
> cpu-common.c              | 6 +++---
> target/s390x/cpu_models.c | 2 +-
> 3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index e02bc5980f..d0dc0a1698 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -586,13 +586,13 @@ static inline CPUArchState *cpu_env(CPUState *cpu)
> }
> 
> typedef QTAILQ_HEAD(CPUTailQ, CPUState) CPUTailQ;
> -extern CPUTailQ cpus;
> +extern CPUTailQ cpus_queue;
> 
> -#define first_cpu        QTAILQ_FIRST_RCU(&cpus)
> +#define first_cpu        QTAILQ_FIRST_RCU(&cpus_queue)
> #define CPU_NEXT(cpu)    QTAILQ_NEXT_RCU(cpu, node)
> -#define CPU_FOREACH(cpu) QTAILQ_FOREACH_RCU(cpu, &cpus, node)
> +#define CPU_FOREACH(cpu) QTAILQ_FOREACH_RCU(cpu, &cpus_queue, node)
> #define CPU_FOREACH_SAFE(cpu, next_cpu) \
> -    QTAILQ_FOREACH_SAFE_RCU(cpu, &cpus, node, next_cpu)
> +    QTAILQ_FOREACH_SAFE_RCU(cpu, &cpus_queue, node, next_cpu)
> 
> extern __thread CPUState *current_cpu;
> 
> diff --git a/cpu-common.c b/cpu-common.c
> index 45c745ecf6..c81fd72d16 100644
> --- a/cpu-common.c
> +++ b/cpu-common.c
> @@ -73,7 +73,7 @@ static int cpu_get_free_index(void)
>     return max_cpu_index;
> }
> 
> -CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus);
> +CPUTailQ cpus_queue = QTAILQ_HEAD_INITIALIZER(cpus_queue);
> static unsigned int cpu_list_generation_id;
> 
> unsigned int cpu_list_generation_id_get(void)
> @@ -90,7 +90,7 @@ void cpu_list_add(CPUState *cpu)
>     } else {
>         assert(!cpu_index_auto_assigned);
>     }
> -    QTAILQ_INSERT_TAIL_RCU(&cpus, cpu, node);
> +    QTAILQ_INSERT_TAIL_RCU(&cpus_queue, cpu, node);
>     cpu_list_generation_id++;
> }
> 
> @@ -102,7 +102,7 @@ void cpu_list_remove(CPUState *cpu)
>         return;
>     }
> 
> -    QTAILQ_REMOVE_RCU(&cpus, cpu, node);
> +    QTAILQ_REMOVE_RCU(&cpus_queue, cpu, node);
>     cpu->cpu_index = UNASSIGNED_CPU_INDEX;
>     cpu_list_generation_id++;
> }
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index 98f14c09c2..b1e77b3a2b 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -756,7 +756,7 @@ void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, 
> uint8_t ec_ga,
>     const S390CPUDef *def = s390_find_cpu_def(type, gen, ec_ga, NULL);
> 
>     g_assert(def);
> -    g_assert(QTAILQ_EMPTY_RCU(&cpus));
> +    g_assert(QTAILQ_EMPTY_RCU(&cpus_queue));
> 
>     /* build the CPU model */
>     s390_qemu_cpu_model.def = def;
> -- 
> 2.41.0
>