From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D29CCECE58D for ; Fri, 11 Oct 2019 17:44:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A998C20640 for ; Fri, 11 Oct 2019 17:44:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A998C20640 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyxL-0000zN-Ke for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 13:43:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37293) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRM-0006zK-DE for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxRJ-0004wx-Ph for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:52 -0400 Received: from relay.sw.ru ([185.231.240.75]:48536) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxRJ-0004aS-G6; Fri, 11 Oct 2019 12:06:49 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIxQx-0003XG-P2; Fri, 11 Oct 2019 19:06:27 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 095/126] Sheepdog: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:21 +0300 Message-Id: <20191011160552.22907-96-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011160552.22907-1-vsementsov@virtuozzo.com> References: <20191011160552.22907-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , vsementsov@virtuozzo.com, sheepdog@lists.wpkg.org, qemu-block@nongnu.org, armbru@redhat.com, Max Reitz , Greg Kurz , Liu Yuan Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. Otherwise, this info will not be added when errp == &fatal_err (the program will exit prior to the error_append_hint() or error_prepend() call). Fix such cases. If we want to check error after errp-function call, we need to introduce local_err and than propagate it to errp. Instead, use ERRP_AUTO_PROPAGATE macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_AUTO_PROPAGATE leaves errp as is if it's not NULL or &error_fatel, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) This commit (together with its neighbors) was generated by for f in $(git grep -l errp \*.[ch]); do \ spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff $f; \ done; then fix a bit of compilation problems: coccinelle for some reason leaves several f() { ... goto out; ... out: } patterns, with "out:" at function end. then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Kevin Wolf Reported-by: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/sheepdog.c | 73 ++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 773dfc6ab1..396ec1be28 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -529,10 +529,10 @@ static void sd_aio_setup(SheepdogAIOCB *acb, BDRVSheepdogState *s, static SocketAddress *sd_server_config(QDict *options, Error **errp) { + ERRP_AUTO_PROPAGATE(); QDict *server = NULL; Visitor *iv = NULL; SocketAddress *saddr = NULL; - Error *local_err = NULL; qdict_extract_subqdict(options, &server, "server."); @@ -541,9 +541,8 @@ static SocketAddress *sd_server_config(QDict *options, Error **errp) goto done; } - visit_type_SocketAddress(iv, NULL, &saddr, &local_err); - if (local_err) { - error_propagate(errp, local_err); + visit_type_SocketAddress(iv, NULL, &saddr, errp); + if (*errp) { goto done; } @@ -1008,7 +1007,7 @@ static void sd_config_done(SheepdogConfig *cfg) static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, Error **errp) { - Error *err = NULL; + ERRP_AUTO_PROPAGATE(); QueryParams *qp = NULL; bool is_unix; URI *uri; @@ -1017,7 +1016,7 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, cfg->uri = uri = uri_parse(filename); if (!uri) { - error_setg(&err, "invalid URI '%s'", filename); + error_setg(errp, "invalid URI '%s'", filename); goto out; } @@ -1029,18 +1028,18 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, } else if (!g_strcmp0(uri->scheme, "sheepdog+unix")) { is_unix = true; } else { - error_setg(&err, "URI scheme must be 'sheepdog', 'sheepdog+tcp'," + error_setg(errp, "URI scheme must be 'sheepdog', 'sheepdog+tcp'," " or 'sheepdog+unix'"); goto out; } if (uri->path == NULL || !strcmp(uri->path, "/")) { - error_setg(&err, "missing file path in URI"); + error_setg(errp, "missing file path in URI"); goto out; } if (g_strlcpy(cfg->vdi, uri->path + 1, SD_MAX_VDI_LEN) >= SD_MAX_VDI_LEN) { - error_setg(&err, "VDI name is too long"); + error_setg(errp, "VDI name is too long"); goto out; } @@ -1049,25 +1048,25 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, if (is_unix) { /* sheepdog+unix:///vdiname?socket=path */ if (uri->server || uri->port) { - error_setg(&err, "URI scheme %s doesn't accept a server address", + error_setg(errp, "URI scheme %s doesn't accept a server address", uri->scheme); goto out; } if (!qp->n) { - error_setg(&err, + error_setg(errp, "URI scheme %s requires query parameter 'socket'", uri->scheme); goto out; } if (qp->n != 1 || strcmp(qp->p[0].name, "socket")) { - error_setg(&err, "unexpected query parameters"); + error_setg(errp, "unexpected query parameters"); goto out; } cfg->path = qp->p[0].value; } else { /* sheepdog[+tcp]://[host:port]/vdiname */ if (qp->n) { - error_setg(&err, "unexpected query parameters"); + error_setg(errp, "unexpected query parameters"); goto out; } cfg->host = uri->server; @@ -1078,7 +1077,7 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, if (uri->fragment) { if (!sd_parse_snapid_or_tag(uri->fragment, &cfg->snap_id, cfg->tag)) { - error_setg(&err, "'%s' is not a valid snapshot ID", + error_setg(errp, "'%s' is not a valid snapshot ID", uri->fragment); goto out; } @@ -1087,8 +1086,7 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, } out: - if (err) { - error_propagate(errp, err); + if (*errp) { sd_config_done(cfg); } } @@ -1113,7 +1111,7 @@ out: static void parse_vdiname(SheepdogConfig *cfg, const char *filename, Error **errp) { - Error *err = NULL; + ERRP_AUTO_PROPAGATE(); char *p, *q, *uri; const char *host_spec, *vdi_spec; int nr_sep; @@ -1155,14 +1153,14 @@ static void parse_vdiname(SheepdogConfig *cfg, const char *filename, * FIXME We to escape URI meta-characters, e.g. "x?y=z" * produces "sheepdog://x?y=z". Because of that ... */ - sd_parse_uri(cfg, uri, &err); - if (err) { + sd_parse_uri(cfg, uri, errp); + if (*errp) { /* * ... this can fail, but the error message is misleading. * Replace it by the traditional useless one until the * escaping is fixed. */ - error_free(err); + error_free_errp(errp); error_setg(errp, "Can't parse filename"); } @@ -1173,17 +1171,16 @@ static void parse_vdiname(SheepdogConfig *cfg, const char *filename, static void sd_parse_filename(const char *filename, QDict *options, Error **errp) { - Error *err = NULL; + ERRP_AUTO_PROPAGATE(); SheepdogConfig cfg; char buf[32]; if (strstr(filename, "://")) { - sd_parse_uri(&cfg, filename, &err); + sd_parse_uri(&cfg, filename, errp); } else { - parse_vdiname(&cfg, filename, &err); + parse_vdiname(&cfg, filename, errp); } - if (err) { - error_propagate(errp, err); + if (*errp) { return; } @@ -1543,6 +1540,7 @@ static QemuOptsList runtime_opts = { static int sd_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { + ERRP_AUTO_PROPAGATE(); int ret, fd; uint32_t vid = 0; BDRVSheepdogState *s = bs->opaque; @@ -1550,15 +1548,13 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags, uint64_t snap_id; char *buf = NULL; QemuOpts *opts; - Error *local_err = NULL; s->bs = bs; s->aio_context = bdrv_get_aio_context(bs); opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); - qemu_opts_absorb_qdict(opts, options, &local_err); - if (local_err) { - error_propagate(errp, local_err); + qemu_opts_absorb_qdict(opts, options, errp); + if (*errp) { ret = -EINVAL; goto err_no_fd; } @@ -1850,19 +1846,18 @@ out_with_err_set: static int sd_create_prealloc(BlockdevOptionsSheepdog *location, int64_t size, Error **errp) { + ERRP_AUTO_PROPAGATE(); BlockDriverState *bs; Visitor *v; QObject *obj = NULL; QDict *qdict; - Error *local_err = NULL; int ret; v = qobject_output_visitor_new(&obj); - visit_type_BlockdevOptionsSheepdog(v, NULL, &location, &local_err); + visit_type_BlockdevOptionsSheepdog(v, NULL, &location, errp); visit_free(v); - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { qobject_unref(obj); return -EINVAL; } @@ -2160,11 +2155,11 @@ out: static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts, Error **errp) { + ERRP_AUTO_PROPAGATE(); BlockdevCreateOptions *create_options = NULL; QDict *qdict, *location_qdict; Visitor *v; char *redundancy; - Error *local_err = NULL; int ret; redundancy = qemu_opt_get_del(opts, BLOCK_OPT_REDUNDANCY); @@ -2175,9 +2170,8 @@ static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts, location_qdict = qdict_new(); qdict_put(qdict, "location", location_qdict); - sd_parse_filename(filename, location_qdict, &local_err); - if (local_err) { - error_propagate(errp, local_err); + sd_parse_filename(filename, location_qdict, errp); + if (*errp) { ret = -EINVAL; goto fail; } @@ -2203,11 +2197,10 @@ static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts, goto fail; } - visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); + visit_type_BlockdevCreateOptions(v, NULL, &create_options, errp); visit_free(v); - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { ret = -EINVAL; goto fail; } -- 2.21.0