From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Subject: [kvm-unit-tests PATCH v5 04/18] devicetree: fix dt_get_memory_params Date: Wed, 17 Feb 2016 19:40:45 +0100 Message-ID: <1455734459-31902-5-git-send-email-drjones@redhat.com> References: <1455734459-31902-1-git-send-email-drjones@redhat.com> Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:52675 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422865AbcBQSlQ (ORCPT ); Wed, 17 Feb 2016 13:41:16 -0500 In-Reply-To: <1455734459-31902-1-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Index nr was overreaching with its indexing. It should only index the caller's regs array. We need a different index for the memory nodes' reg properties. Signed-off-by: Andrew Jones Reviewed-by: Thomas Huth Tested-by: Laurent Vivier Reviewed-by: David Gibson --- The next patch needs this fix. --- lib/devicetree.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/devicetree.c b/lib/devicetree.c index 36cb28610ff41..a5c7f7c69ddfd 100644 --- a/lib/devicetree.c +++ b/lib/devicetree.c @@ -165,22 +165,24 @@ int dt_pbus_get_base_compatible(const char *compatible, int dt_get_memory_params(struct dt_pbus_reg *regs, int nr_regs) { const char *pn = "device_type", *pv = "memory"; - int node, ret, pl = strlen(pv) + 1, nr = 0; + int node, ret, reg_idx, pl = strlen(pv) + 1, nr = 0; struct dt_pbus_reg reg; node = fdt_node_offset_by_prop_value(fdt, -1, pn, pv, pl); while (node >= 0) { + reg_idx = 0; + while (nr < nr_regs) { - ret = dt_pbus_translate_node(node, nr, ®); + ret = dt_pbus_translate_node(node, reg_idx, ®); if (ret == -FDT_ERR_NOTFOUND) break; if (ret < 0) return ret; regs[nr].addr = reg.addr; regs[nr].size = reg.size; - ++nr; + ++nr, ++reg_idx; } node = fdt_node_offset_by_prop_value(fdt, node, pn, pv, pl); -- 2.4.3