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 7C8E5ECE58C for ; Fri, 11 Oct 2019 16:39:59 +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 4F7BA2089F for ; Fri, 11 Oct 2019 16:39:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F7BA2089F 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]:54050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxxN-0003KA-Vs for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 12:39:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36658) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR3-0006Sb-Jv for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR1-0004ef-QZ for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:33 -0400 Received: from relay.sw.ru ([185.231.240.75]:48276) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR1-0004Mz-Gp for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:31 -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 1iIxQp-0003XG-Rb; Fri, 11 Oct 2019 19:06:20 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 069/126] chardev: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:55 +0300 Message-Id: <20191011160552.22907-70-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, armbru@redhat.com, Greg Kurz , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 --- chardev/char-socket.c | 7 +++---- chardev/char.c | 20 +++++++++----------- chardev/spice.c | 1 + 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 185fe38dda..75649630d3 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -963,6 +963,7 @@ static void tcp_chr_accept_server_sync(Chardev *chr) static int tcp_chr_wait_connected(Chardev *chr, Error **errp) { + ERRP_AUTO_PROPAGATE(); SocketChardev *s = SOCKET_CHARDEV(chr); const char *opts[] = { "telnet", "tn3270", "websock", "tls-creds" }; bool optset[] = { s->is_telnet, s->is_tn3270, s->is_websock, s->tls_creds }; @@ -1031,13 +1032,11 @@ static int tcp_chr_wait_connected(Chardev *chr, Error **errp) if (s->is_listen) { tcp_chr_accept_server_sync(chr); } else { - Error *err = NULL; - if (tcp_chr_connect_client_sync(chr, &err) < 0) { + if (tcp_chr_connect_client_sync(chr, errp) < 0) { if (s->reconnect_time) { - error_free(err); + error_free_errp(errp); g_usleep(s->reconnect_time * 1000ULL * 1000ULL); } else { - error_propagate(errp, err); return -1; } } diff --git a/chardev/char.c b/chardev/char.c index 7b6b2cb123..49eb5ffe06 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -603,7 +603,7 @@ static const char *chardev_alias_translate(const char *name) ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error **errp) { - Error *local_err = NULL; + ERRP_AUTO_PROPAGATE(); const ChardevClass *cc; ChardevBackend *backend = NULL; const char *name = chardev_alias_translate(qemu_opt_get(opts, "backend")); @@ -623,9 +623,8 @@ ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error **errp) backend->type = CHARDEV_BACKEND_KIND_NULL; if (cc->parse) { - cc->parse(opts, backend, &local_err); - if (local_err) { - error_propagate(errp, local_err); + cc->parse(opts, backend, errp); + if (*errp) { qapi_free_ChardevBackend(backend); return NULL; } @@ -949,9 +948,9 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, GMainContext *gcontext, Error **errp) { + ERRP_AUTO_PROPAGATE(); Object *obj; Chardev *chr = NULL; - Error *local_err = NULL; bool be_opened = true; assert(g_str_has_prefix(typename, "chardev-")); @@ -961,8 +960,8 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, chr->label = g_strdup(id); chr->gcontext = gcontext; - qemu_char_open(chr, backend, &be_opened, &local_err); - if (local_err) { + qemu_char_open(chr, backend, &be_opened, errp); + if (*errp) { goto end; } @@ -974,16 +973,15 @@ Chardev *qemu_chardev_new(const char *id, const char *typename, } if (id) { - object_property_add_child(get_chardevs_root(), id, obj, &local_err); - if (local_err) { + object_property_add_child(get_chardevs_root(), id, obj, errp); + if (*errp) { goto end; } object_unref(obj); } end: - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { object_unref(obj); return NULL; } diff --git a/chardev/spice.c b/chardev/spice.c index 241e2b7770..ce2145fb19 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -267,6 +267,7 @@ static void qemu_chr_open_spice_vmc(Chardev *chr, bool *be_opened, Error **errp) { + ERRP_AUTO_PROPAGATE(); ChardevSpiceChannel *spicevmc = backend->u.spicevmc.data; const char *type = spicevmc->type; const char **psubtype = spice_server_char_device_recognized_subtypes(); -- 2.21.0