From nobody Sun Feb 8 18:29:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570813536; cv=none; d=zoho.com; s=zohoarc; b=d19WBxPUf+0nY0vXNAX/J98T43UvVEZWakzWWgiB6ai4XA+iBZ3TFtbG8J4PiY2uwwHgbvxGRFXAZVsendaQq8W2bK2KjATqxEOdNHJc+/vkh8G/zbCxTWg/ZfSmFvKflS+L1j/iqGX98H1Ms2CnKwFt1ecPBOy023qQp5CVbQc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813536; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EVau3oBZtMn8b5M1XdjmIbEJCSaB8iDv7TAhViAh+2E=; b=XRxRK9pruBhyda77fDWwpWXJVXG1E8zpnXVQbKhiTWPYsnc/YtXbO7UD03zFcBM/x/3ZOEn3qPX71h6yT9uhKqp3nYg1U3xp52BgUIyPvpu+WvQ41L9D8Oj3bUquiZrd/JMt1iPCI1aNYNoH1g74bCFu00la9JLqUfKb5cYsXsY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570813536154740.2877797516192; Fri, 11 Oct 2019 10:05:36 -0700 (PDT) Received: from localhost ([::1]:54334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyM6-0001OS-9i for importer@patchew.org; Fri, 11 Oct 2019 13:05:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37051) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRE-0006lz-Df for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxRB-0004qU-7A for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:44 -0400 Received: from relay.sw.ru ([185.231.240.75]:48262) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxRA-0004Mj-U9; Fri, 11 Oct 2019 12:06:41 -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-Hj; Fri, 11 Oct 2019 19:06:19 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 068/126] scsi: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:54 +0300 Message-Id: <20191011160552.22907-69-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: quoted-printable 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 , Fam Zheng , vsementsov@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, Greg Kurz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 =3D=3D &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 --- scsi/pr-manager-helper.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scsi/pr-manager-helper.c b/scsi/pr-manager-helper.c index ca27c93283..f41eaa8524 100644 --- a/scsi/pr-manager-helper.c +++ b/scsi/pr-manager-helper.c @@ -101,13 +101,13 @@ static int pr_manager_helper_write(PRManagerHelper *p= r_mgr, static int pr_manager_helper_initialize(PRManagerHelper *pr_mgr, Error **errp) { + ERRP_AUTO_PROPAGATE(); char *path =3D g_strdup(pr_mgr->path); SocketAddress saddr =3D { .type =3D SOCKET_ADDRESS_TYPE_UNIX, .u.q_unix.path =3D path }; QIOChannelSocket *sioc =3D qio_channel_socket_new(); - Error *local_err =3D NULL; =20 uint32_t flags; int r; @@ -116,11 +116,10 @@ static int pr_manager_helper_initialize(PRManagerHelp= er *pr_mgr, qio_channel_set_name(QIO_CHANNEL(sioc), "pr-manager-helper"); qio_channel_socket_connect_sync(sioc, &saddr, - &local_err); + errp); g_free(path); - if (local_err) { + if (*errp) { object_unref(OBJECT(sioc)); - error_propagate(errp, local_err); return -ENOTCONN; } =20 --=20 2.21.0