Commit 99861ecb authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

spapr: cleanup spapr_fixup_cpu_numa_dt() usage 



even though spapr_fixup_cpu_numa_dt() has no effect on FDT
if numa is disabled, don't call it uselessly. It makes it
obvious at call sites that function is needed only when numa
is enabled.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1496161442-96665-7-git-send-email-imammedo@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 15f8b142

hw/ppc/spapr.c

+10 −12
Original line number Diff line number Diff line
@@ -182,10 +182,8 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset, PowerPCCPU *cpu, 
    return ret;

}



static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, CPUState *cs)

static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, PowerPCCPU *cpu)

{

    int ret = 0;

    PowerPCCPU *cpu = POWERPC_CPU(cs);

    int index = ppc_get_vcpu_dt_id(cpu);

    uint32_t associativity[] = {cpu_to_be32(0x5),

                                cpu_to_be32(0x0),
@@ -195,14 +193,10 @@ static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, CPUState *cs) 
                                cpu_to_be32(index)};



    /* Advertise NUMA via ibm,associativity */

    if (nb_numa_nodes > 1) {

        ret = fdt_setprop(fdt, offset, "ibm,associativity", associativity,

    return fdt_setprop(fdt, offset, "ibm,associativity", associativity,

                          sizeof(associativity));

}



    return ret;

}



/* Populate the "ibm,pa-features" property */

static void spapr_populate_pa_features(CPUPPCState *env, void *fdt, int offset,

                                      bool legacy_guest)
@@ -325,10 +319,12 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPRMachineState *spapr) 
            return ret;

        }



        ret = spapr_fixup_cpu_numa_dt(fdt, offset, cs);

        if (nb_numa_nodes > 1) {

            ret = spapr_fixup_cpu_numa_dt(fdt, offset, cpu);

            if (ret < 0) {

                return ret;

            }

        }



        ret = spapr_fixup_cpu_smt_dt(fdt, offset, cpu, compat_smt);

        if (ret < 0) {
@@ -542,7 +538,9 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, 
    _FDT((fdt_setprop(fdt, offset, "ibm,pft-size",

                      pft_size_prop, sizeof(pft_size_prop))));



    _FDT(spapr_fixup_cpu_numa_dt(fdt, offset, cs));

    if (nb_numa_nodes > 1) {

        _FDT(spapr_fixup_cpu_numa_dt(fdt, offset, cpu));

    }



    _FDT(spapr_fixup_cpu_smt_dt(fdt, offset, cpu, compat_smt));