From patchwork Mon Sep 17 09:02:53 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: 184330 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 956702C0189 for ; Mon, 17 Sep 2012 19:03:56 +1000 (EST) Received: from localhost ([::1]:57930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDXFC-00021p-Kx for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 05:03:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDXF0-0001xE-IX for qemu-devel@nongnu.org; Mon, 17 Sep 2012 05:03:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDXEv-0001Ye-O4 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 05:03:42 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:39068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDXEv-0001XC-J0 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 05:03:37 -0400 Received: by mail-ie0-f173.google.com with SMTP id c10so8784577ieb.4 for ; Mon, 17 Sep 2012 02:03:37 -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=vpFzX0cT3IqlDZ+th8ZimcCMwBDLnzFbvahcAFDBLTc=; b=fDRZtQDg8Sb+uCipzh8nImPiHQg1GQ+uVrE8fcWDUm/SpZ82KAsYBWAH7Yyf2ZWHNC oRu2cJWG66VZzw/P2e/DcLwvFB5i9b2ZYtcklAky5OHJ55oEA8m1ERijS2vl0xlhBMh/ Gb+aL0To5vQJv5kd5UVGBND9/wZ9nJl9Z5xC1CStwcxqe3RMDom2HkPnBj4bmNsOGDgA AejQn/wAIqgt9/5MeJgrjZB09V8FnZmbzxyr2c24IrMOZ190M6aVAIdYepUYF1w0j1Bz I4R/ViDgzcpPtgv0f47m25KJf0rxYpM7OATFcFQ3BG0DkuY86JQbi6G7lYwhd8nDojwD jkhw== Received: by 10.50.187.233 with SMTP id fv9mr6090163igc.18.1347872617307; Mon, 17 Sep 2012 02:03:37 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id mi10sm16549936igc.16.2012.09.17.02.03.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 02:03:36 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Mon, 17 Sep 2012 19:02:53 +1000 Message-Id: <3ad651bfaa7f433b2bb032d6ef3035b270894130.1347871922.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQn7EHXFveMrZGCe4imI93XBwTyUgfdhNSftWt6CM10Y+LmLTMGhzwzlY8mycrDdJnW4TqE0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.223.173 Cc: peter.crosthwaite@petalogix.com, crwulff@gmail.com Subject: [Qemu-devel] [RFC v0 01/10] device_tree: allow offsets for cell properties 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 Signed-off-by: Peter A. G. Crosthwaite --- device_tree.c | 10 +++++----- device_tree.h | 2 +- hw/arm_boot.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/device_tree.c b/device_tree.c index d7a9b6b..92a383e 100644 --- a/device_tree.c +++ b/device_tree.c @@ -196,16 +196,16 @@ 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) + const char *property, int offset) { int len; const uint32_t *p = qemu_devtree_getprop(fdt, node_path, property, &len); - if (len != 4) { - fprintf(stderr, "%s: %s/%s not 4 bytes long (not a cell?)\n", - __func__, node_path, property); + if (len < (offset+1)*4) { + fprintf(stderr, "%s: %s/%s not long enough to hold %d properties\n", + __func__, node_path, property, offset+1); exit(1); } - return be32_to_cpu(*p); + return be32_to_cpu(p[offset]); } uint32_t qemu_devtree_get_phandle(void *fdt, const char *path) diff --git a/device_tree.h b/device_tree.h index f7a3e6c..759e142 100644 --- a/device_tree.h +++ b/device_tree.h @@ -31,7 +31,7 @@ int qemu_devtree_setprop_phandle(void *fdt, const char *node_path, const void *qemu_devtree_getprop(void *fdt, const char *node_path, const char *property, int *lenp); uint32_t qemu_devtree_getprop_cell(void *fdt, const char *node_path, - const char *property); + const char *property, int offset); 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 a6e9143..051aee6 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -237,8 +237,8 @@ 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"); - scells = qemu_devtree_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_devtree_getprop_cell(fdt, "/", "#address-cells", 0); + scells = qemu_devtree_getprop_cell(fdt, "/", "#size-cells", 0); if (acells == 0 || scells == 0) { fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); return -1;