From nobody Sun Feb 8 22:07:08 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=1570815819; cv=none; d=zoho.com; s=zohoarc; b=SYNOwJ/Oa8j8f81tVjGg/kedotaJak3dBpRiBA1WSletdD+kTo1mXBBtgQ/3XrD2e1Bnj8lOX6RIFw3k5Aiw6c5ebW7VOJcnywEsKIqg7v8MNKJLSZR8bGoY71ILESfsqBqM99w/9x4ffC2VQO9BisJtuTb+LJzc1OIqulJ6ug0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570815819; 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=q82OZeei3lDu/jW0FZn9MKegSMz/54xaFtTZIQoTVy0=; b=WUejVvgy3qT3ZTX19k8MKxpq/OElbn/OJR3mwbZOpWzSCi43LdPBazZKML9ka04xJq0Ldab4ifj/JD5GMvTRiqqlfAQNtC0Ju3tDi2I26UD1015Z3ipdTl/OUgFB1ct9Nb7B6yJVi/uj6OaOrLvDIrfjCz6FmhgD4Dlg6PXekYU= 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 1570815819841858.049947573652; Fri, 11 Oct 2019 10:43:39 -0700 (PDT) Received: from localhost ([::1]:54836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyx0-0000bO-93 for importer@patchew.org; Fri, 11 Oct 2019 13:43:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41457) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxli-0007Aa-7y for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:27:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxlg-0002cH-Jl for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:27:54 -0400 Received: from relay.sw.ru ([185.231.240.75]:49820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxlg-0002c0-Cp; Fri, 11 Oct 2019 12:27:52 -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 1iIxR6-0003XG-5E; Fri, 11 Oct 2019 19:06:36 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 110/126] qed: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:36 +0300 Message-Id: <20191011160552.22907-111-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/qed.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/block/qed.c b/block/qed.c index 0d8fd507aa..689522519d 100644 --- a/block/qed.c +++ b/block/qed.c @@ -721,11 +721,11 @@ static int coroutine_fn bdrv_qed_co_create_opts(const= char *filename, QemuOpts *opts, Error **errp) { + ERRP_AUTO_PROPAGATE(); BlockdevCreateOptions *create_options =3D NULL; QDict *qdict; Visitor *v; BlockDriverState *bs =3D NULL; - Error *local_err =3D NULL; int ret; =20 static const QDictRenames opt_renames[] =3D { @@ -745,9 +745,8 @@ static int coroutine_fn bdrv_qed_co_create_opts(const c= har *filename, } =20 /* Create and open the file (protocol layer) */ - ret =3D bdrv_create_file(filename, opts, &local_err); + ret =3D bdrv_create_file(filename, opts, errp); if (ret < 0) { - error_propagate(errp, local_err); goto fail; } =20 @@ -768,11 +767,10 @@ static int coroutine_fn bdrv_qed_co_create_opts(const= char *filename, goto fail; } =20 - visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); + visit_type_BlockdevCreateOptions(v, NULL, &create_options, errp); visit_free(v); =20 - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { ret =3D -EINVAL; goto fail; } @@ -1587,18 +1585,18 @@ static int bdrv_qed_change_backing_file(BlockDriver= State *bs, static void coroutine_fn bdrv_qed_co_invalidate_cache(BlockDriverState *bs, Error **errp) { + ERRP_AUTO_PROPAGATE(); BDRVQEDState *s =3D bs->opaque; - Error *local_err =3D NULL; int ret; =20 bdrv_qed_close(bs); =20 bdrv_qed_init_state(bs); qemu_co_mutex_lock(&s->table_lock); - ret =3D bdrv_qed_do_open(bs, NULL, bs->open_flags, &local_err); + ret =3D bdrv_qed_do_open(bs, NULL, bs->open_flags, errp); qemu_co_mutex_unlock(&s->table_lock); - if (local_err) { - error_propagate_prepend(errp, local_err, + if (*errp) { + error_prepend(errp, "Could not reopen qed layer: "); return; } else if (ret < 0) { --=20 2.21.0