From patchwork Thu Dec 17 12:29:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 58587 Delivered-To: patches@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp332387lbb; Thu, 17 Dec 2015 04:29:37 -0800 (PST) X-Received: by 10.28.147.203 with SMTP id v194mr3658028wmd.16.1450355377033; Thu, 17 Dec 2015 04:29:37 -0800 (PST) Return-Path: Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com. [2a00:1450:400c:c09::22d]) by mx.google.com with ESMTPS id d188si3607683wmf.104.2015.12.17.04.29.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Dec 2015 04:29:37 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22d as permitted sender) client-ip=2a00:1450:400c:c09::22d; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22d as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x22d.google.com with SMTP id l126so21263984wml.1 for ; Thu, 17 Dec 2015 04:29: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=6C6lTP/J0rRItwziESe4Ldbf5zejhUo53OhltwY0exQ=; b=a1ZPVBbq/30zRuhTl6MePL8WAb9f/b2T9Abz7Ue7Gi7U6EJNHgOiIZWwJzG1elqaB+ QHp/8BOnPHMHBwSndYw11BHbdKN7EYDPYLl/Xw94kkpKo1FOULzXRkPl8EEVerCE7+Js KtAa6frrsFivLWx2gy3lYx3YhfDXI3VGT8OrI= 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=6C6lTP/J0rRItwziESe4Ldbf5zejhUo53OhltwY0exQ=; b=EsrZyTfBPQAWiixif5ltbof0AR5pS+xgY9sYWxyihPIQvkXeaD40z2Vqy2dXJp0aEu DzXy0E1vOhMfePK0lVcUCGGW6jNTuR8NOJUI0ZLI/Ib6AW0FO55zgwaLCfyZUJp1JIf8 frvHzQf3k2UGnO7VCzPWo3PUYdyFXxN4isMCxBPnHcqG4a4kprIZg8ZdRrzfRXzJUEx6 NyhiGdlBnLeyWt7PyHhTz4hCVatVdJoUx8PG4kI8iBPKuLrHKcTt6UG7JEkh5667EmlR 7mQHNvFFNaqfmQHpinvjo/NQFTUyJKzS4m+C2YlMOx/tA9Ox/656DWaMMQSKnVw8OBQD nf4A== X-Gm-Message-State: ALoCoQk6GziJGRuz1mI+s3d26ZfMnj85mcwpBxBebMU9bkRDh1M7xZxo8/bz8Ja+mrDMuojSr3ykeUud82p9TylRPsBAKTHBNw== X-Received: by 10.194.134.134 with SMTP id pk6mr47554640wjb.21.1450355376837; Thu, 17 Dec 2015 04:29:36 -0800 (PST) Return-Path: Received: from new-host-17.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id bh6sm10313963wjb.0.2015.12.17.04.29.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 04:29:30 -0800 (PST) From: Eric Auger 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: 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 4/6] device_tree: qemu_fdt_getprop converted to use the error API Date: Thu, 17 Dec 2015 12:29:25 +0000 Message-Id: <1450355367-14818-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450355367-14818-1-git-send-email-eric.auger@linaro.org> References: <1450355367-14818-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 --- 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(-) -- 1.9.1 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);