From patchwork Tue Sep 24 20:09:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11159551 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B6F251709 for ; Tue, 24 Sep 2019 20:23: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 92E5E20872 for ; Tue, 24 Sep 2019 20:23:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92E5E20872 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCrL1-0007oZ-63 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 24 Sep 2019 16:23:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44084) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCr8P-0000uW-D8 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 16:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCr8O-00032I-10 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 16:10:05 -0400 Received: from relay.sw.ru ([185.231.240.75]:38174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCr8N-0002un-G6 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 16:10:03 -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 1iCr8C-0001Mk-2A; Tue, 24 Sep 2019 23:09:52 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v3 23/25] Sockets: Fix error_append_hint usage Date: Tue, 24 Sep 2019 23:09:00 +0300 Message-Id: <20190924200902.4703-24-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190924200902.4703-1-vsementsov@virtuozzo.com> References: <20190924200902.4703-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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: vsementsov@virtuozzo.com, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Greg Kurz , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" If we want append hint to errp, we must use ERRP_FUNCTION_BEGIN macro. Otherwise hint will not be appended in case of errp == &fatal_err (program will exit before error_append_hint() call). Fix such cases. This commit (together with its neighbors) was generated by git grep -l 'error_append_hint(errp' | while read f; do \ spatch --sp-file scripts/coccinelle/fix-error_append_hint-usage.cocci \ --in-place $f; done and 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: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- util/qemu-sockets.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 98ff3a1cce..fb21b78369 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -860,6 +860,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, int num, Error **errp) { + ERRP_FUNCTION_BEGIN(); struct sockaddr_un un; int sock, fd; char *pathbuf = NULL; @@ -935,6 +936,7 @@ err: static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp) { + ERRP_FUNCTION_BEGIN(); struct sockaddr_un un; int sock, rc; size_t pathlen;