From patchwork Fri Jan 8 09:32:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 59337 Delivered-To: patches@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp438574lbb; Fri, 8 Jan 2016 01:32:25 -0800 (PST) X-Received: by 10.28.174.77 with SMTP id x74mr20509224wme.99.1452245545714; Fri, 08 Jan 2016 01:32:25 -0800 (PST) Return-Path: Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com. [2a00:1450:400c:c09::22f]) by mx.google.com with ESMTPS id ib8si131773744wjb.163.2016.01.08.01.32.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jan 2016 01:32:25 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22f as permitted sender) client-ip=2a00:1450:400c:c09::22f; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22f as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x22f.google.com with SMTP id l65so127508311wmf.1 for ; Fri, 08 Jan 2016 01:32:25 -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=zuxFGK3aUKVEn5tLKbVKoTI77h/rgqJdu5EQAgSvaFk=; b=O6q3Cudv0g4DG73NOIrm1MxltwEez64phDG76uxHdKMe3gTkJeReMglpdMnT0u+BuG iiv6T7s/jcZIlWkcKDalHyoHHKBI4lrcBA6kjrAEuYOfnTrCJQdAd79Uq6/zdXA4p01A XciDjnTTj8i/TDbyI5XCLJRtYVDlZp2Tcksio= 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=zuxFGK3aUKVEn5tLKbVKoTI77h/rgqJdu5EQAgSvaFk=; b=SHasQ34PcTJtqtD5VNpdZBndo6pcwptnbqJIC9XegeJ0svBQdSCBrAUo4xyKNXxsvc 6zQpXTFhLpgPZDE9n/Y4a3jKSoZZfjTrtXTwdG+CkeRvI8++elEfczQ3NT4SplQQLtQj iTv3DfVDG4vTIGvix6OLAerkIVrGQ13Bxi+v6uF1rO40SXsGnea1JR5HdJw3JvZvX4jc Iw/snm6FP5/0oorewI73+sy5JktqWiPJruxSu1r2wIZgb0TZzEj/YXx/VkePTpMQFOuS lVKuxUovRpskiEgOEx3HBnxWiNauJiC6q0+ql0rXTq1TRjKVIh94s+StcPLVspfT+gPY sUVw== X-Gm-Message-State: ALoCoQl+azhtuoepcHM4A1yBf+vMfyFHauvbKNxPD0z5KMca1812sqiq1/ltjElWqiiMEDuWfOBz846yq9vGweQMzcaaPH2EoQ== X-Received: by 10.194.114.106 with SMTP id jf10mr127636668wjb.149.1452245545504; Fri, 08 Jan 2016 01:32:25 -0800 (PST) Return-Path: Received: from new-host-8.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id av8sm30226968wjc.13.2016.01.08.01.32.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 01:32:23 -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 v4 5/8] device_tree: qemu_fdt_getprop_cell converted to use the error API Date: Fri, 8 Jan 2016 09:32:02 +0000 Message-Id: <1452245525-3886-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452245525-3886-1-git-send-email-eric.auger@linaro.org> References: <1452245525-3886-1-git-send-email-eric.auger@linaro.org> This patch aligns the prototype with qemu_fdt_getprop. The caller can choose whether the function self-asserts on error (passing &error_fatal as Error ** argument, corresponding to the legacy behavior), or behaves differently such as simply output a message. In this later case the caller can use the new lenp parameter to interpret the error if any. Signed-off-by: Eric Auger --- v3 : creation --- device_tree.c | 21 ++++++++++++++------- hw/arm/boot.c | 6 ++++-- hw/arm/vexpress.c | 6 ++++-- include/sysemu/device_tree.h | 16 +++++++++++++++- 4 files changed, 37 insertions(+), 12 deletions(-) -- 1.9.1 diff --git a/device_tree.c b/device_tree.c index 6ecc9da..0e837bf 100644 --- a/device_tree.c +++ b/device_tree.c @@ -338,15 +338,22 @@ const void *qemu_fdt_getprop(void *fdt, const char *node_path, } uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, - const char *property) + const char *property, int *lenp, Error **errp) { int 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); - exit(1); + const uint32_t *p; + + if (!lenp) { + lenp = &len; + } + p = qemu_fdt_getprop(fdt, node_path, property, lenp, errp); + if (!p) { + return 0; + } else if (*lenp != 4) { + error_setg(errp, "%s: %s/%s not 4 bytes long (not a cell?)", + __func__, node_path, property); + *lenp = -EINVAL; + return 0; } return be32_to_cpu(*p); } diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 75f69bf..541b74c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -386,8 +386,10 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, return 0; } - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); if (acells == 0 || scells == 0) { fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); goto fail; diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 058abbd..ffe42be 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -482,8 +482,10 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt) uint32_t acells, scells, intc; const VEDBoardInfo *daughterboard = (const VEDBoardInfo *)info; - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells"); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells"); + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); intc = find_int_controller(fdt); if (!intc) { /* Not fatal, we just won't provide virtio. This will diff --git a/include/sysemu/device_tree.h b/include/sysemu/device_tree.h index 4d7cbb9..5aa750b 100644 --- a/include/sysemu/device_tree.h +++ b/include/sysemu/device_tree.h @@ -60,8 +60,22 @@ int qemu_fdt_setprop_phandle(void *fdt, const char *node_path, const void *qemu_fdt_getprop(void *fdt, const char *node_path, const char *property, int *lenp, Error **errp); +/** + * qemu_fdt_getprop_cell: retrieve the value of a given 4 byte 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 -EINVAL if the property size is different from + * 4 bytes, or 4 (expected length of the property) upon success. + * @errp: handle to an error object + * + * returns the property value on success + * in case errp is set to &error_fatal, the function auto-asserts + * on error (legacy behavior) + */ uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, - const char *property); + const char *property, int *lenp, + Error **errp); uint32_t qemu_fdt_get_phandle(void *fdt, const char *path); uint32_t qemu_fdt_alloc_phandle(void *fdt); int qemu_fdt_nop_node(void *fdt, const char *node_path);