Skip to content

Commit

Permalink
spapr: Clean up local variable shadowing in spapr_dt_cpus()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
legoater authored and Markus Armbruster committed Sep 29, 2023
1 parent 694616d commit bd87a59
Showing 1 changed file with 21 additions and 15 deletions.
36 changes: 21 additions & 15 deletions hw/ppc/spapr.c
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,26 @@ static void spapr_dt_cpu(CPUState *cs, void *fdt, int offset,
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)
{
CPUState **rev;
Expand Down Expand Up @@ -809,21 +829,7 @@ static void spapr_dt_cpus(void *fdt, SpaprMachineState *spapr)
}

for (i = n_cpus - 1; i >= 0; i--) {
CPUState *cs = rev[i];
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);
spapr_dt_one_cpu(fdt, spapr, rev[i], cpus_offset);
}

g_free(rev);
Expand Down

0 comments on commit bd87a59

Please sign in to comment.