vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/cpu: Clean up global variable shadowing 

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>
Message-Id: <20231010115048.11856-2-philmd@linaro.org>
master
Philippe Mathieu-Daudé 2023-10-09 09:02:04 +02:00
parent 79a99091c1
commit 3c55dd5896
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/main.c
View File

@ -118,7 +118,7 @@ void fork_end(int child)
*/ */
CPU_FOREACH_SAFE(cpu, next_cpu) { CPU_FOREACH_SAFE(cpu, next_cpu) {
if (cpu != thread_cpu) { if (cpu != thread_cpu) {
QTAILQ_REMOVE_RCU(&cpus, cpu, node); QTAILQ_REMOVE_RCU(&cpus_queue, cpu, node);
} }
} }
mmap_fork_end(child); mmap_fork_end(child);

6
cpu-common.c
View File

@ -73,7 +73,7 @@ static int cpu_get_free_index(void)
return max_cpu_index; 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; static unsigned int cpu_list_generation_id;
unsigned int cpu_list_generation_id_get(void) unsigned int cpu_list_generation_id_get(void)
@ -90,7 +90,7 @@ void cpu_list_add(CPUState *cpu)
} else { } else {
assert(!cpu_index_auto_assigned); assert(!cpu_index_auto_assigned);
} }
QTAILQ_INSERT_TAIL_RCU(&cpus, cpu, node); QTAILQ_INSERT_TAIL_RCU(&cpus_queue, cpu, node);
cpu_list_generation_id++; cpu_list_generation_id++;
} }
@ -102,7 +102,7 @@ void cpu_list_remove(CPUState *cpu)
return; return;
} }
QTAILQ_REMOVE_RCU(&cpus, cpu, node); QTAILQ_REMOVE_RCU(&cpus_queue, cpu, node);
cpu->cpu_index = UNASSIGNED_CPU_INDEX; cpu->cpu_index = UNASSIGNED_CPU_INDEX;
cpu_list_generation_id++; cpu_list_generation_id++;
} }

8
include/hw/core/cpu.h
View File

@ -586,13 +586,13 @@ static inline CPUArchState *cpu_env(CPUState *cpu)
} }
typedef QTAILQ_HEAD(CPUTailQ, CPUState) CPUTailQ; 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_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) \ #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; extern __thread CPUState *current_cpu;

2
linux-user/main.c
View File

@ -156,7 +156,7 @@ void fork_end(int child)
Discard information about the parent threads. */ Discard information about the parent threads. */
CPU_FOREACH_SAFE(cpu, next_cpu) { CPU_FOREACH_SAFE(cpu, next_cpu) {
if (cpu != thread_cpu) { if (cpu != thread_cpu) {
QTAILQ_REMOVE_RCU(&cpus, cpu, node); QTAILQ_REMOVE_RCU(&cpus_queue, cpu, node);
} }
} }
qemu_init_cpu_list(); qemu_init_cpu_list();

2
target/s390x/cpu_models.c
View File

@ -757,7 +757,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); const S390CPUDef *def = s390_find_cpu_def(type, gen, ec_ga, NULL);
g_assert(def); g_assert(def);
g_assert(QTAILQ_EMPTY_RCU(&cpus)); g_assert(QTAILQ_EMPTY_RCU(&cpus_queue));
/* build the CPU model */ /* build the CPU model */
s390_qemu_cpu_model.def = def; s390_qemu_cpu_model.def = def;