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 2C0B0C47404 for ; Fri, 11 Oct 2019 16:58:50 +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 01D6921835 for ; Fri, 11 Oct 2019 16:58:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01D6921835 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]:54246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyFc-0000e1-Kr for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 12:58:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37001) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRC-0006j3-PU 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-0004oO-JF for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:42 -0400 Received: from relay.sw.ru ([185.231.240.75]:48478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR8-0004WI-8Y 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-En; Fri, 11 Oct 2019 19:06:26 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 090/126] Sockets: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:16 +0300 Message-Id: <20191011160552.22907-91-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 , Gerd Hoffmann 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 --- util/qemu-sockets.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index bcc06d0e01..12db07c092 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -211,6 +211,7 @@ static int inet_listen_saddr(InetSocketAddress *saddr, int num, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct addrinfo ai,*res,*e; char port[33]; char uaddr[INET6_ADDRSTRLEN+1]; @@ -219,7 +220,6 @@ static int inet_listen_saddr(InetSocketAddress *saddr, int slisten = -1; int saved_errno = 0; bool socket_created = false; - Error *err = NULL; if (saddr->keep_alive) { error_setg(errp, "keep-alive option is not supported for passive " @@ -232,11 +232,10 @@ static int inet_listen_saddr(InetSocketAddress *saddr, if (saddr->has_numeric && saddr->numeric) { ai.ai_flags |= AI_NUMERICHOST | AI_NUMERICSERV; } - ai.ai_family = inet_ai_family_from_address(saddr, &err); + ai.ai_family = inet_ai_family_from_address(saddr, errp); ai.ai_socktype = SOCK_STREAM; - if (err) { - error_propagate(errp, err); + if (*errp) { return -1; } @@ -387,9 +386,9 @@ static int inet_connect_addr(struct addrinfo *addr, Error **errp) static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct addrinfo ai, *res; int rc; - Error *err = NULL; static int useV4Mapped = 1; memset(&ai, 0, sizeof(ai)); @@ -398,11 +397,10 @@ static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, if (atomic_read(&useV4Mapped)) { ai.ai_flags |= AI_V4MAPPED; } - ai.ai_family = inet_ai_family_from_address(saddr, &err); + ai.ai_family = inet_ai_family_from_address(saddr, errp); ai.ai_socktype = SOCK_STREAM; - if (err) { - error_propagate(errp, err); + if (*errp) { return NULL; } @@ -443,7 +441,7 @@ static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, */ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp) { - Error *local_err = NULL; + ERRP_AUTO_PROPAGATE(); struct addrinfo *res, *e; int sock = -1; @@ -453,9 +451,8 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp) } for (e = res; e != NULL; e = e->ai_next) { - error_free(local_err); - local_err = NULL; - sock = inet_connect_addr(e, &local_err); + error_free_errp(errp); + sock = inet_connect_addr(e, errp); if (sock >= 0) { break; } @@ -464,7 +461,6 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp) freeaddrinfo(res); if (sock < 0) { - error_propagate(errp, local_err); return sock; } @@ -487,20 +483,19 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, InetSocketAddress *sladdr, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct addrinfo ai, *peer = NULL, *local = NULL; const char *addr; const char *port; int sock = -1, rc; - Error *err = NULL; /* lookup peer addr */ memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_CANONNAME | AI_V4MAPPED | AI_ADDRCONFIG; - ai.ai_family = inet_ai_family_from_address(sraddr, &err); + ai.ai_family = inet_ai_family_from_address(sraddr, errp); ai.ai_socktype = SOCK_DGRAM; - if (err) { - error_propagate(errp, err); + if (*errp) { goto err; } @@ -861,6 +856,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, int num, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct sockaddr_un un; int sock, fd; char *pathbuf = NULL; @@ -936,6 +932,7 @@ err: static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct sockaddr_un un; int sock, rc; size_t pathlen; -- 2.21.0