From patchwork Thu Feb 18 17:45:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 584857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 478971401AD for ; Fri, 19 Feb 2016 04:50:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=eSrgDQmb; dkim-atps=neutral Received: from localhost ([::1]:43824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWSin-0003AS-A7 for incoming@patchwork.ozlabs.org; Thu, 18 Feb 2016 12:50:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWSeT-0003Dp-Sf for qemu-devel@nongnu.org; Thu, 18 Feb 2016 12:46:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWSeS-0002xj-7T for qemu-devel@nongnu.org; Thu, 18 Feb 2016 12:46:05 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:32773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWSeR-0002xN-Sx for qemu-devel@nongnu.org; Thu, 18 Feb 2016 12:46:04 -0500 Received: by mail-wm0-x22b.google.com with SMTP id g62so36159292wme.0 for ; Thu, 18 Feb 2016 09:46:03 -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=vah/PzoAH/oWR65RGdWF+EHfVDO+cRlbVRzs7Az/ULc=; b=eSrgDQmbbMfSKP3XP/XJUfLxu5ZFih2xIJuvOQtwAJxP5vMsGUUTLNggYxRQ0IJCAe nMp4G/uLye6d+Cstyl14WIEGq73Jho/MGawt2xRzOfdlpZNBjQufUDFz2O6S17E4GwQK 0VBcpwhVB9TgOcWIL5PC7k2MQZZDJKSPWIoyY= 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=vah/PzoAH/oWR65RGdWF+EHfVDO+cRlbVRzs7Az/ULc=; b=ZNXizhm4L4FenNUZUakUyO/3brono4xZ5G0Y2kt4NF2MsCtF1V2I+p5BogifACGJZR nBobDeY1wK90o6nGbpfMoUYcsfcsEurAhWYe026r84cmLngsl1odSSTkLahsrX1dh8Ec A15mhNDWkWdk2hZu8BSFMdGJE72DGpPaFhDpfjaJnTE4mLkMUeGwE0TpMrDhhmbHJj0k hW1dhPE7HOXIlKhkkGT4H4ckzfAPQvHodjhYJfa/H5xkGy0VjLNbvpTFUYHX7zy9JxAC KjD870Zv0hCgkI7/n9Sa9Lq1ErltCGQBySY/XYGtcG6ymToNLX+X3XJ3YkpYiRp4o72W FySg== X-Gm-Message-State: AG10YORz95EKR/h2oOb1ovpyZufxDaiNhQn3PbSxhjnjnhurpH3ygHlKX71sHLNiFGE/e9iO X-Received: by 10.28.173.71 with SMTP id w68mr4947616wme.88.1455817563287; Thu, 18 Feb 2016 09:46:03 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by smtp.gmail.com with ESMTPSA id ct2sm7592997wjb.46.2016.02.18.09.46.01 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Feb 2016 09:46:01 -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, alex.williamson@redhat.com, david@gibson.dropbear.id.au Date: Thu, 18 Feb 2016 17:45:42 +0000 Message-Id: <1455817546-6564-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1455817546-6564-1-git-send-email-eric.auger@linaro.org> References: <1455817546-6564-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 v7 4/8] device_tree: qemu_fdt_getprop 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Current qemu_fdt_getprop exits if the property is not found. It is sometimes needed to read an optional property, in which case we do not wish to exit but simply returns a null value. This patch converts qemu_fdt_getprop to accept an Error **, and existing users are converted to pass &error_fatal. This preserves the existing behaviour. Then to use the API with your optional semantic a null parameter can be conveyed. Signed-off-by: Eric Auger Reviewed-by: Peter Crosthwaite --- v4 -> v5: - add Peter's R-b - remove comment about error_fatal v1 -> v2: - add a doc comment in the header file RFC -> v1: - get rid of qemu_fdt_getprop_optional and implement Peter's suggestion that consists in using the error API Signed-off-by: Eric Auger --- device_tree.c | 11 ++++++----- include/sysemu/device_tree.h | 13 ++++++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/device_tree.c b/device_tree.c index 2587257..c93a615 100644 --- a/device_tree.c +++ b/device_tree.c @@ -330,18 +330,18 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path, } const void *qemu_fdt_getprop(void *fdt, const char *node_path, - const char *property, int *lenp) + const char *property, int *lenp, Error **errp) { int len; const void *r; + if (!lenp) { lenp = &len; } r = fdt_getprop(fdt, findnode_nofail(fdt, node_path), property, lenp); if (!r) { - error_report("%s: Couldn't get %s/%s: %s", __func__, - node_path, property, fdt_strerror(*lenp)); - exit(1); + error_setg(errp, "%s: Couldn't get %s/%s: %s", __func__, + node_path, property, fdt_strerror(*lenp)); } return r; } @@ -350,7 +350,8 @@ uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, const char *property) { int len; - const uint32_t *p = qemu_fdt_getprop(fdt, node_path, property, &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); diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index 552df21..48bf3b5 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -54,8 +54,19 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path, int qemu_fdt_setprop_phandle(void *fdt, const char *node_path, const char *property, const char *target_node_path); +/** + * qemu_fdt_getprop: retrieve the value of a given 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 length of the property on success + * @errp: handle to an error object + * + * returns a pointer to the property on success and NULL on failure + */ const void *qemu_fdt_getprop(void *fdt, const char *node_path, - const char *property, int *lenp); + const char *property, int *lenp, + Error **errp); uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, const char *property); uint32_t qemu_fdt_get_phandle(void *fdt, const char *path);