[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] spapr: cleanup spapr_fixup_cpu_numa_dt() usage
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 07/10] spapr: cleanup spapr_fixup_cpu_numa_dt() usage |
Date: |
Mon, 5 Jun 2017 15:59:24 -0300 |
From: Igor Mammedov <address@hidden>
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: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Greg Kurz <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/ppc/spapr.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 96471a5d89..70eb60efed 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -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,12 +193,8 @@ 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 */
@@ -325,9 +319,11 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPRMachineState
*spapr)
return ret;
}
- ret = spapr_fixup_cpu_numa_dt(fdt, offset, cs);
- if (ret < 0) {
- return ret;
+ 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);
@@ -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));
--
2.11.0.259.g40922b1
- [Qemu-devel] [PULL 00/10] x86 and machine queue, 2017-06-05, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 01/10] pc: Use "min-[x]level" on compat_props, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 02/10] numa: consolidate cpu_preplug fixups/checks for pc/arm/spapr, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 03/10] numa: move default mapping init to machine, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 04/10] numa: make sure that all cpus have has_node_id set if numa is enabled, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 05/10] numa: make hmp 'info numa' fetch numa nodes from qmp_query_cpus() result, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 06/10] numa: move numa_node from CPUState into target specific classes, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 07/10] spapr: cleanup spapr_fixup_cpu_numa_dt() usage,
Eduardo Habkost <=
- [Qemu-devel] [PULL 09/10] qemu.py: Add QEMUMachine.exitcode() method, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 08/10] qemu.py: Don't set _popen=None on error/shutdown, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 10/10] scripts: Test script to look for -device crashes, Eduardo Habkost, 2017/06/05
- Re: [Qemu-devel] [PULL 00/10] x86 and machine queue, 2017-06-05, Peter Maydell, 2017/06/06