mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-02 01:04:11 +00:00
spapr: Clean up local variable shadowing in spapr_dt_cpus()
Introduce a helper routine defining one CPU device node to fix this warning : ../hw/ppc/spapr.c: In function ‘spapr_dt_cpus’: ../hw/ppc/spapr.c:812:19: warning: declaration of ‘cs’ shadows a previous local [-Wshadow=compatible-local] 812 | CPUState *cs = rev[i]; | ^~ ../hw/ppc/spapr.c:786:15: note: shadowed declaration is here 786 | CPUState *cs; | ^~ Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-ID: <20230918145850.241074-4-clg@kaod.org> Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
694616d684
commit
bd87a59f52
|
@ -780,6 +780,26 @@ static void spapr_dt_cpu(CPUState *cs, void *fdt, int offset,
|
||||||
pcc->lrg_decr_bits)));
|
pcc->lrg_decr_bits)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void spapr_dt_one_cpu(void *fdt, SpaprMachineState *spapr, CPUState *cs,
|
||||||
|
int cpus_offset)
|
||||||
|
{
|
||||||
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
||||||
|
int index = spapr_get_vcpu_id(cpu);
|
||||||
|
DeviceClass *dc = DEVICE_GET_CLASS(cs);
|
||||||
|
g_autofree char *nodename = NULL;
|
||||||
|
int offset;
|
||||||
|
|
||||||
|
if (!spapr_is_thread0_in_vcore(spapr, cpu)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
nodename = g_strdup_printf("%s@%x", dc->fw_name, index);
|
||||||
|
offset = fdt_add_subnode(fdt, cpus_offset, nodename);
|
||||||
|
_FDT(offset);
|
||||||
|
spapr_dt_cpu(cs, fdt, offset, spapr);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr)
|
static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr)
|
||||||
{
|
{
|
||||||
CPUState **rev;
|
CPUState **rev;
|
||||||
|
@ -809,21 +829,7 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = n_cpus - 1; i >= 0; i--) {
|
for (i = n_cpus - 1; i >= 0; i--) {
|
||||||
CPUState *cs = rev[i];
|
spapr_dt_one_cpu(fdt, spapr, rev[i], cpus_offset);
|
||||||
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
||||||
int index = spapr_get_vcpu_id(cpu);
|
|
||||||
DeviceClass *dc = DEVICE_GET_CLASS(cs);
|
|
||||||
g_autofree char *nodename = NULL;
|
|
||||||
int offset;
|
|
||||||
|
|
||||||
if (!spapr_is_thread0_in_vcore(spapr, cpu)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
nodename = g_strdup_printf("%s@%x", dc->fw_name, index);
|
|
||||||
offset = fdt_add_subnode(fdt, cpus_offset, nodename);
|
|
||||||
_FDT(offset);
|
|
||||||
spapr_dt_cpu(cs, fdt, offset, spapr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
g_free(rev);
|
g_free(rev);
|
||||||
|
|
Loading…
Reference in a new issue