From patchwork Mon Jan 18 15:16:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 8055341 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6A319BEEE5 for ; Mon, 18 Jan 2016 15:19:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8806A203AC for ; Mon, 18 Jan 2016 15:19:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADB3E203A1 for ; Mon, 18 Jan 2016 15:19:00 +0000 (UTC) Received: from localhost ([::1]:60271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLBa8-0002yR-21 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 18 Jan 2016 10:19:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLBYF-00086O-Im for qemu-devel@nongnu.org; Mon, 18 Jan 2016 10:17:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLBYE-0001dR-Ax for qemu-devel@nongnu.org; Mon, 18 Jan 2016 10:17:03 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:37981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLBYE-0001dB-0W for qemu-devel@nongnu.org; Mon, 18 Jan 2016 10:17:02 -0500 Received: by mail-wm0-x22b.google.com with SMTP id b14so127945382wmb.1 for ; Mon, 18 Jan 2016 07:17:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YAqqlMidsRkmnZCXlbdTmg3HBOK9b2UWt3IOtmrdF6c=; b=EeXfq/sa+kTZaJy8rf0C6RRLY31lWhvGtB2XCjDV/1wiF4ebOcoty1b3nWF5VqOyeq o2uEbhM6jxeJBAt1NqEYmmPWZ7KnQ9LkOxTEhjbCmM2FiGm1jSGRDafjwqzQ1DWexj4/ b4yl5J2HBdWoG3HJAVYb9Nk5rhvOb+tRqxbpc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YAqqlMidsRkmnZCXlbdTmg3HBOK9b2UWt3IOtmrdF6c=; b=H7pCnrEvgzTh/tgJ6jGyflPrHOtzL+ZemdqWd1CRGEvCOH1gAXrIwKmoAujC1BELLO Ev89VUtyA75nXp4rYsINJ7qFmwe88NBXi3W9qiZwV51Aal3ly791ZFjhVQrDxGkFp0L+ Ov14L9V+rTJWzaZMaG7hT5dYEcD2jn8GVB8AAlD7lBtJl/QvY9RdSHKslFMu3GXkBUzt v+EArys5NRCa36Dqq8qLLLSDxehCqlMaNJ2vWaPLhh/wQiaDZw6ZrFi0LAhCZGmL42Dp d20HY8bnJyXoo5kdDV68SbfX3Esnp1HcA8aBzTri04wggWn/jTRwn9gplcR9Mbzg3G3Z 3Vtw== X-Gm-Message-State: ALoCoQmOqKDrbEGsL25qunCcmx/WPlkTeHcUah9oKEwpo3UgMeuaGy2TLlQef9nVOb/mhUss9g5xcev9hCqk1c7barTummc11A== X-Received: by 10.194.90.243 with SMTP id bz19mr24849401wjb.128.1453130221384; Mon, 18 Jan 2016 07:17:01 -0800 (PST) Received: from new-host-9.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id o7sm24230067wjf.45.2016.01.18.07.16.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jan 2016 07:16:59 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, david@gibson.dropbear.id.au, alex.williamson@redhat.com Date: Mon, 18 Jan 2016 15:16:41 +0000 Message-Id: <1453130204-655-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453130204-655-1-git-send-email-eric.auger@linaro.org> References: <1453130204-655-1-git-send-email-eric.auger@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22b Cc: thomas.lendacky@amd.com, thuth@redhat.com, b.reynal@virtualopensystems.com, patches@linaro.org, crosthwaitepeter@gmail.com, suravee.suthikulpanit@amd.com, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org Subject: [Qemu-devel] [PATCH v5 5/8] device_tree: qemu_fdt_getprop_cell converted to use the error API 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch aligns the prototype with qemu_fdt_getprop. The caller can choose whether the function self-asserts on error (passing &error_fatal as Error ** argument, corresponding to the legacy behavior), or behaves differently such as simply output a message. In this later case the caller can use the new lenp parameter to interpret the error if any. Signed-off-by: Eric Auger Reviewed-by: Peter Crosthwaite --- v4 -> v5: - Add Peter's R-b - remove comment about error_fatal v3 : creation --- device_tree.c | 21 ++++++++++++++------- hw/arm/boot.c | 6 ++++-- hw/arm/vexpress.c | 6 ++++-- include/sysemu/device_tree.h | 14 +++++++++++++- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/device_tree.c b/device_tree.c index 45fd76d..5e56f8e 100644 --- a/device_tree.c +++ b/device_tree.c @@ -350,15 +350,22 @@ const void *qemu_fdt_getprop(void *fdt, const char *node_path, } uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, - const char *property) + const char *property, int *lenp, Error **errp) { int len; - const uint32_t *p = qemu_fdt_getprop(fdt, node_path, property, &len, - &error_fatal); - if (len != 4) { - error_report("%s: %s/%s not 4 bytes long (not a cell?)", - __func__, node_path, property); - exit(1); + const uint32_t *p; + + if (!lenp) { + lenp = &len; + } + p = qemu_fdt_getprop(fdt, node_path, property, lenp, errp); + if (!p) { + return 0; + } else if (*lenp != 4) { + error_setg(errp, "%s: %s/%s not 4 bytes long (not a cell?)", + __func__, node_path, property); + *lenp = -EINVAL; + return 0; } return be32_to_cpu(*p); } diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 75f69bf..541b74c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -386,8 +386,10 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, return 0; } - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); if (acells == 0 || scells == 0) { fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); goto fail; diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index ea9a984..f6e28dc 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -477,8 +477,10 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt) uint32_t acells, scells, intc; const VEDBoardInfo *daughterboard = (const VEDBoardInfo *)info; - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); intc = find_int_controller(fdt); if (!intc) { /* Not fatal, we just won't provide virtio. This will diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index 123beb5..7897e54 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -58,8 +58,20 @@ int qemu_fdt_setprop_phandle(void *fdt, const char *node_path, const void *qemu_fdt_getprop(void *fdt, const char *node_path, const char *property, int *lenp, Error **errp); +/** + * qemu_fdt_getprop_cell: retrieve the value of a given 4 byte property + * @fdt: pointer to the device tree blob + * @node_path: node path + * @property: name of the property to find + * @lenp: fdt error if any or -EINVAL if the property size is different from + * 4 bytes, or 4 (expected length of the property) upon success. + * @errp: handle to an error object + * + * returns the property value on success + */ uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, - const char *property); + const char *property, int *lenp, + Error **errp); uint32_t qemu_fdt_get_phandle(void *fdt, const char *path); uint32_t qemu_fdt_alloc_phandle(void *fdt); int qemu_fdt_nop_node(void *fdt, const char *node_path);