From patchwork Mon Sep 17 09:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 184332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F013B2C0086 for ; Mon, 17 Sep 2012 19:08:41 +1000 (EST) Received: from localhost ([::1]:59875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDXFa-00033E-8k for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 05:04:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDXF9-0002MN-BL for qemu-devel@nongnu.org; Mon, 17 Sep 2012 05:04:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDXF7-0001aC-Ns for qemu-devel@nongnu.org; Mon, 17 Sep 2012 05:03:51 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:53565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDXF7-0001a3-J8 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 05:03:49 -0400 Received: by iakx26 with SMTP id x26so4933478iak.4 for ; Mon, 17 Sep 2012 02:03:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=dHi59Q22rh8bIfGoS5cdeU+D5kMeDOmcjD7tWOE9XmE=; b=cDFinxTJE/1VcOsv8z7tJeQ/pKk1b6EuNP7dbrNsR77OfprLnaqHA14X/smAUEk4Tt Uef79IQldzU3VP6V9MYPtsHhk1EzlvZNX/9HYvvncjwOF7HdEAghjBMM9kBWpC6SUkb2 ASgRwwXAA71qWzjP6k8g+bnjQoIBloWcvqCcqnqhKlzquMbTtLEiCMtkA2EI9Hj5eYcf 1UfbRmLj5C4op392M4j+laesbh1xs3AgLFqFRE74W0ZAOaYtvz4Zd5Cd3tiB+lmJDuze /WdGQL5ayHe8xVr074jvM6BGAkbo1zv+u1V+q7RVuwe/B3xuy8wXE+MNeDmhNpc1Guwa W6hw== Received: by 10.50.187.194 with SMTP id fu2mr6043572igc.37.1347872628940; Mon, 17 Sep 2012 02:03:48 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ch4sm6909403igb.2.2012.09.17.02.03.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 02:03:48 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Mon, 17 Sep 2012 19:02:55 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQnvJKV6NoGvwNlGGEbIlLTcDGlH135CJlsII4tm6p48Zl6SFRUeuuy4RxruePr+KE2eEJft X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.173 Cc: peter.crosthwaite@petalogix.com, crwulff@gmail.com Subject: [Qemu-devel] [RFC v0 03/10] device_tree: allow property getters to inherit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the inherit flag is set, and the specified property is not found, then search the parents for it as well. Signed-off-by: Peter A. G. Crosthwaite --- device_tree.c | 11 ++++++++--- device_tree.h | 4 ++-- hw/arm_boot.c | 6 ++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/device_tree.c b/device_tree.c index 3792085..7edbbff 100644 --- a/device_tree.c +++ b/device_tree.c @@ -180,7 +180,7 @@ int qemu_devtree_setprop_string(void *fdt, const char *node_path, const void *qemu_devtree_getprop(void *fdt, const char *node_path, const char *property, int *lenp, - Error **errp) + bool inherit, Error **errp) { int len; const void *r; @@ -189,6 +189,11 @@ const void *qemu_devtree_getprop(void *fdt, const char *node_path, } r = fdt_getprop(fdt, findnode_nofail(fdt, node_path), property, lenp); if (!r) { + char parent[DT_PATH_LENGTH]; + if (inherit && !qemu_devtree_getparent(fdt, parent, node_path)) { + return qemu_devtree_getprop(fdt, parent, property, lenp, true, + errp); + } fprintf(stderr, "%s: Couldn't get %s/%s: %s\n", __func__, node_path, property, fdt_strerror(*lenp)); /* FIXME: Be smarter */ @@ -200,11 +205,11 @@ const void *qemu_devtree_getprop(void *fdt, const char *node_path, uint32_t qemu_devtree_getprop_cell(void *fdt, const char *node_path, const char *property, int offset, - Error **errp) + bool inherit, Error **errp) { int len; const uint32_t *p = qemu_devtree_getprop(fdt, node_path, property, &len, - errp); + inherit, errp); if (errp && *errp) { return 0; } diff --git a/device_tree.h b/device_tree.h index b707085..c3f3b28 100644 --- a/device_tree.h +++ b/device_tree.h @@ -33,10 +33,10 @@ int qemu_devtree_setprop_phandle(void *fdt, const char *node_path, const char *target_node_path); const void *qemu_devtree_getprop(void *fdt, const char *node_path, const char *property, int *lenp, - Error **errp); + bool inherit, Error **errp); uint32_t qemu_devtree_getprop_cell(void *fdt, const char *node_path, const char *property, int offset, - Error **errp); + bool inherit, Error **errp); uint32_t qemu_devtree_get_phandle(void *fdt, const char *path); uint32_t qemu_devtree_alloc_phandle(void *fdt); int qemu_devtree_nop_node(void *fdt, const char *node_path); diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 45a7455..d79605c 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -239,8 +239,10 @@ static int load_dtb(target_phys_addr_t addr, const struct arm_boot_info *binfo) } g_free(filename); - acells = qemu_devtree_getprop_cell(fdt, "/", "#address-cells", 0, &errp); - scells = qemu_devtree_getprop_cell(fdt, "/", "#size-cells", 0, &errp); + acells = qemu_devtree_getprop_cell(fdt, "/", "#address-cells", 0, + false, &errp); + scells = qemu_devtree_getprop_cell(fdt, "/", "#size-cells", 0, + false, &errp); assert_no_error(errp); if (acells == 0 || scells == 0) {