From patchwork Wed Jan 6 15:13:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 59249 Delivered-To: patches@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp6636770lbb; Wed, 6 Jan 2016 07:13:36 -0800 (PST) X-Received: by 10.194.202.135 with SMTP id ki7mr86807399wjc.81.1452093216172; Wed, 06 Jan 2016 07:13:36 -0800 (PST) Return-Path: Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com. [2a00:1450:400c:c09::22b]) by mx.google.com with ESMTPS id v10si13186862wmd.0.2016.01.06.07.13.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2016 07:13:36 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22b as permitted sender) client-ip=2a00:1450:400c:c09::22b; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22b as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x22b.google.com with SMTP id l65so62836164wmf.1 for ; Wed, 06 Jan 2016 07:13:36 -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=shZPHsvOQormtinDO9b78KhUZdxB/4UyawV7i+/Evoc=; b=bwXybO8yvdCkD4foEY5i0Oa4Sg93ArrE21YY53KnL3J01LeEi34lg4j2jnLWHRZHof gqMVYUi9Y4spAz6dCzSR77qm9p4+CtcmdSGe2/5FpkD13yQXAQ2PlPoQj0HkrN7KaSnB 4s27a9VQ+4bXecbvoXi7X37R/75g/DpFfJsaM= 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=shZPHsvOQormtinDO9b78KhUZdxB/4UyawV7i+/Evoc=; b=cl1w0OPqPc2uwnEYO7zgDpHl1eUwwg3tHs8RHUnZ7WKGwH4Zt/hTCPlxpROlwQPvV6 XK2N6WFpK2SxIXOXGLDxgMh0athbZCfy08oZi+oEP1ipDkF/iPMZxGHLBYKMV6xSor0H oNSnj0n9zyQtG6dhGLYAJuU37GoRSwmNdePsWUlVX/BWZyfjW+qxYBDxtZlbxw7RiyQx bZnymbZeci5owAJROXecEDuuRpBmR9UdG/FCh1mvg6NMt8Y88j8VtyQ8yV0lBnkENGFA R0qGdpjWJ+WZ5fdohH2t4C7ZpC/Y0n6W1uy0mqe6RjdWZ3+bs9mXTIusYxALJgjNIwJZ eojg== X-Gm-Message-State: ALoCoQln0hjzpHCnHfEGJtk0u/pZpD6jAqzxk9ge3eOTBaJLfgTYbVmbOaQHlewoKXvO06BYgIPGkJVQqSpY3kZdxuqU61Q+Pg== X-Received: by 10.194.87.39 with SMTP id u7mr108193147wjz.11.1452093215958; Wed, 06 Jan 2016 07:13:35 -0800 (PST) Return-Path: Received: from new-host-6.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id df10sm81858826wjb.44.2016.01.06.07.13.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jan 2016 07:13:34 -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 Cc: alex.bennee@linaro.org, thuth@redhat.com, crosthwaitepeter@gmail.com, patches@linaro.org, christoffer.dall@linaro.org, pbonzini@redhat.com, b.reynal@virtualopensystems.com, suravee.suthikulpanit@amd.com, thomas.lendacky@amd.com Subject: [PATCH v2 4/7] device_tree: qemu_fdt_getprop converted to use the error API Date: Wed, 6 Jan 2016 15:13:22 +0000 Message-Id: <1452093205-30167-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452093205-30167-1-git-send-email-eric.auger@linaro.org> References: <1452093205-30167-1-git-send-email-eric.auger@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 --- 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 | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/device_tree.c b/device_tree.c index 8441e01..6ecc9da 100644 --- a/device_tree.c +++ b/device_tree.c @@ -321,18 +321,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; } @@ -341,7 +341,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 269cb1c..4d7cbb9 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -45,8 +45,21 @@ 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 + * in case errp is set to &error_fatal, the function auto-asserts + * on error (legacy behavior) + */ 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);