From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9Xgj-0008To-TB for qemu-devel@nongnu.org; Thu, 17 Dec 2015 07:29:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9Xgf-0006JN-Kv for qemu-devel@nongnu.org; Thu, 17 Dec 2015 07:29:41 -0500 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:35288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9Xgf-0006J2-CM for qemu-devel@nongnu.org; Thu, 17 Dec 2015 07:29:37 -0500 Received: by mail-wm0-x230.google.com with SMTP id l126so19124122wml.0 for ; Thu, 17 Dec 2015 04:29:37 -0800 (PST) From: Eric Auger Date: Thu, 17 Dec 2015 12:29:25 +0000 Message-Id: <1450355367-14818-5-git-send-email-eric.auger@linaro.org> In-Reply-To: <1450355367-14818-1-git-send-email-eric.auger@linaro.org> References: <1450355367-14818-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [PATCH 4/6] device_tree: qemu_fdt_getprop converted to use the error API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, peter.maydell@linaro.org, david@gibson.dropbear.id.au, alex.williamson@redhat.com 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 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 --- 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 | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/device_tree.c b/device_tree.c index b5d7e0b..c3720c2 100644 --- a/device_tree.c +++ b/device_tree.c @@ -331,18 +331,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; } @@ -351,7 +351,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 f9e6e6e..284fd3b 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -33,7 +33,8 @@ int qemu_fdt_setprop_phandle(void *fdt, const char *node_path, const char *property, const char *target_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); 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); -- 1.9.1