From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzR2T-0003Kf-8P for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:22:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzR2S-0000j7-Ev for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:22:21 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:35096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzR2S-0000iw-8h for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:22:20 -0500 Received: by wmdw130 with SMTP id w130so244789536wmd.0 for ; Thu, 19 Nov 2015 07:22:19 -0800 (PST) From: Eric Auger Date: Thu, 19 Nov 2015 15:22:06 +0000 Message-Id: <1447946528-1533-5-git-send-email-eric.auger@linaro.org> In-Reply-To: <1447946528-1533-1-git-send-email-eric.auger@linaro.org> References: <1447946528-1533-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [RESEND RFC 4/6] device_tree: introduce qemu_fdt_getprop_optional 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, qemu-arm@nongnu.org, alex.williamson@redhat.com, peter.maydell@linaro.org Cc: thomas.lendacky@amd.com, b.reynal@virtualopensystems.com, patches@linaro.org, suravee.suthikulpanit@amd.com, pbonzini@redhat.com, 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 is what this new qemu_fdt_getprop_optional function does. Signed-off-by: Eric Auger --- device_tree.c | 17 +++++++++++++++++ include/sysemu/device_tree.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/device_tree.c b/device_tree.c index f184e3c..a318683 100644 --- a/device_tree.c +++ b/device_tree.c @@ -280,6 +280,23 @@ const void *qemu_fdt_getprop(void *fdt, const char *node_path, return r; } +const void *qemu_fdt_getprop_optional(void *fdt, const char *node_path, + const char *property, bool optional, int *lenp) +{ + int len; + const void *r; + if (!lenp) { + lenp = &len; + } + r = fdt_getprop(fdt, findnode_nofail(fdt, node_path), property, lenp); + if (!r && !optional) { + error_report("%s: Couldn't get %s/%s: %s", __func__, + node_path, property, fdt_strerror(*lenp)); + exit(1); + } + return r; +} + uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, const char *property) { diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index f9e6e6e..10cbe8e 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -34,6 +34,8 @@ int qemu_fdt_setprop_phandle(void *fdt, const char *node_path, const char *target_node_path); const void *qemu_fdt_getprop(void *fdt, const char *node_path, const char *property, int *lenp); +const void *qemu_fdt_getprop_optional(void *fdt, const char *node_path, + const char *property, bool optional, int *lenp); 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.8.3.2