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 A5EE5ECE58D for ; Fri, 11 Oct 2019 17:29:08 +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 7F2392064A for ; Fri, 11 Oct 2019 17:29:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F2392064A 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]:54664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyix-0007Vo-IM for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 13:29:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37006) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRD-0006jF-2U for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR8-0004om-NW for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:42 -0400 Received: from relay.sw.ru ([185.231.240.75]:48468) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR8-0004WH-B7 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:38 -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 1iIxQw-0003XG-9B; Fri, 11 Oct 2019 19:06:26 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 089/126] I/O Channels: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:15 +0300 Message-Id: <20191011160552.22907-90-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, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , armbru@redhat.com, Greg Kurz 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 --- io/dns-resolver.c | 7 +++---- io/net-listener.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/io/dns-resolver.c b/io/dns-resolver.c index 6ebe2a5650..a45c5ca0c8 100644 --- a/io/dns-resolver.c +++ b/io/dns-resolver.c @@ -52,13 +52,13 @@ static int qio_dns_resolver_lookup_sync_inet(QIODNSResolver *resolver, SocketAddress ***addrs, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct addrinfo ai, *res, *e; InetSocketAddress *iaddr = &addr->u.inet; char port[33]; char uaddr[INET6_ADDRSTRLEN + 1]; char uport[33]; int rc; - Error *err = NULL; size_t i; *naddrs = 0; @@ -69,11 +69,10 @@ static int qio_dns_resolver_lookup_sync_inet(QIODNSResolver *resolver, if (iaddr->has_numeric && iaddr->numeric) { ai.ai_flags |= AI_NUMERICHOST | AI_NUMERICSERV; } - ai.ai_family = inet_ai_family_from_address(iaddr, &err); + ai.ai_family = inet_ai_family_from_address(iaddr, errp); ai.ai_socktype = SOCK_STREAM; - if (err) { - error_propagate(errp, err); + if (*errp) { return -1; } diff --git a/io/net-listener.c b/io/net-listener.c index 5d8a226872..ba000e7ede 100644 --- a/io/net-listener.c +++ b/io/net-listener.c @@ -65,11 +65,11 @@ int qio_net_listener_open_sync(QIONetListener *listener, int num, Error **errp) { + ERRP_AUTO_PROPAGATE(); QIODNSResolver *resolver = qio_dns_resolver_get_instance(); SocketAddress **resaddrs; size_t nresaddrs; size_t i; - Error *err = NULL; bool success = false; if (qio_dns_resolver_lookup_sync(resolver, @@ -84,7 +84,7 @@ int qio_net_listener_open_sync(QIONetListener *listener, QIOChannelSocket *sioc = qio_channel_socket_new(); if (qio_channel_socket_listen_sync(sioc, resaddrs[i], num, - err ? NULL : &err) == 0) { + *errp ? NULL : errp) == 0) { success = true; qio_net_listener_add(listener, sioc); @@ -96,10 +96,9 @@ int qio_net_listener_open_sync(QIONetListener *listener, g_free(resaddrs); if (success) { - error_free(err); + error_free_errp(errp); return 0; } else { - error_propagate(errp, err); return -1; } } -- 2.21.0