From nobody Sun Feb 8 20:12:47 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=1570818405; cv=none; d=zoho.com; s=zohoarc; b=nyIYyiPQpQyPH0GZjoHPKegXL4YH6FDO+iIlkpqPTipGL3b2V+10zc65XHnzMGrLp5tLEguG8Xd/8HbAyHGGp61aZL6eGY82Hon0i0WVIVGPfd5wgv8lm01NUPO3pZAa4OFdiJpzZYhYCBVIc3ljWCfSOUYl6eSiyNuXChr2hO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570818405; 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=W47WAokon6R7lAD07xrt7xa+O6TOnZvPWrtJ27Jr36I=; b=TjeF8IibvaSEOlMv3YejaNf+T5TYX/y5U5R2QPtPPw14ct5hzX3n+LMYFHAtN0yTDQVOZ51sHgMx+n5kigT2KaIkDH+L4rbs+NJAx4j3Nf0EZtvgeO5U1eA0f8vtnp4JhREPS5TLqE0U7VeI45UncMIVmbpOVZgHBiharcNL2Cc= 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 1570818405900846.5752018783951; Fri, 11 Oct 2019 11:26:45 -0700 (PDT) Received: from localhost ([::1]:55440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIzcg-00086V-8r for importer@patchew.org; Fri, 11 Oct 2019 14:26:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40548) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxh9-0000pN-1l for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:23:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxh7-0008IJ-L3 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:23:10 -0400 Received: from relay.sw.ru ([185.231.240.75]:49680) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxh7-0008H0-BL; Fri, 11 Oct 2019 12:23:09 -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 1iIxR5-0003XG-8N; Fri, 11 Oct 2019 19:06:35 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 108/126] blkverify: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:34 +0300 Message-Id: <20191011160552.22907-109-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 , vsementsov@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, Max Reitz , Greg Kurz , Stefan Hajnoczi 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 --- block/blkverify.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/block/blkverify.c b/block/blkverify.c index 304b0a1368..96e54f8439 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -110,35 +110,32 @@ static QemuOptsList runtime_opts =3D { static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { + ERRP_AUTO_PROPAGATE(); BDRVBlkverifyState *s =3D bs->opaque; QemuOpts *opts; - Error *local_err =3D NULL; int ret; =20 opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); - qemu_opts_absorb_qdict(opts, options, &local_err); - if (local_err) { - error_propagate(errp, local_err); + qemu_opts_absorb_qdict(opts, options, errp); + if (*errp) { ret =3D -EINVAL; goto fail; } =20 /* Open the raw file */ bs->file =3D bdrv_open_child(qemu_opt_get(opts, "x-raw"), options, "ra= w", - bs, &child_file, false, &local_err); - if (local_err) { + bs, &child_file, false, errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto fail; } =20 /* Open the test file */ s->test_file =3D bdrv_open_child(qemu_opt_get(opts, "x-image"), option= s, "test", bs, &child_format, false, - &local_err); - if (local_err) { + errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto fail; } =20 --=20 2.21.0