From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id lx4sm27998287wjb.5.2015.11.26.05.13.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2015 05:13:25 -0800 (PST) Received: from zen.linaro.local (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTPS id A68DC3E0146; Thu, 26 Nov 2015 13:13:24 +0000 (GMT) References: <1447946528-1533-1-git-send-email-eric.auger@linaro.org> <1447946528-1533-5-git-send-email-eric.auger@linaro.org> User-agent: mu4e 0.9.15; emacs 24.5.50.4 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: Eric Auger Cc: eric.auger@st.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, alex.williamson@redhat.com, peter.maydell@linaro.org, thomas.lendacky@amd.com, b.reynal@virtualopensystems.com, patches@linaro.org, suravee.suthikulpanit@amd.com, pbonzini@redhat.com, christoffer.dall@linaro.org Subject: Re: [Qemu-devel] [RESEND RFC 4/6] device_tree: introduce qemu_fdt_getprop_optional In-reply-to: <1447946528-1533-5-git-send-email-eric.auger@linaro.org> Date: Thu, 26 Nov 2015 13:13:24 +0000 Message-ID: <87y4dkc39n.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-TUID: /6Nx7nJHp6iP Eric Auger writes: > 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 Reviewed-by: Alex Bennée > --- > 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); -- Alex Bennée From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1wMc-0007fZ-W7 for qemu-devel@nongnu.org; Thu, 26 Nov 2015 08:13:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1wMY-0001hq-Ui for qemu-devel@nongnu.org; Thu, 26 Nov 2015 08:13:30 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:37245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1wMY-0001hg-MT for qemu-devel@nongnu.org; Thu, 26 Nov 2015 08:13:26 -0500 Received: by wmww144 with SMTP id w144so22098247wmw.0 for ; Thu, 26 Nov 2015 05:13:26 -0800 (PST) References: <1447946528-1533-1-git-send-email-eric.auger@linaro.org> <1447946528-1533-5-git-send-email-eric.auger@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1447946528-1533-5-git-send-email-eric.auger@linaro.org> Date: Thu, 26 Nov 2015 13:13:24 +0000 Message-ID: <87y4dkc39n.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [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 Cc: peter.maydell@linaro.org, eric.auger@st.com, thomas.lendacky@amd.com, patches@linaro.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, qemu-arm@nongnu.org, suravee.suthikulpanit@amd.com, pbonzini@redhat.com, b.reynal@virtualopensystems.com, christoffer.dall@linaro.org Eric Auger writes: > 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 Reviewed-by: Alex Bennée > --- > 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); -- Alex Bennée