From nobody Sun Feb 8 22:34:01 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=1570813678; cv=none; d=zoho.com; s=zohoarc; b=jrScQEjYR6UBoEHYzNNv0jkt8p3/fTTr72HJYcs2BEjxRelMMwGDEiqD+yWesZmMcZf+zkSKPvw4UAlOZUemHQOGHXpuLRmhhhlN1YfRMyDJe3CiYH0x0ds4AZ55aIFWUuSC1SxlB9dAZVy/oFO/YQR0xpHgpTMna7134cqmUVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813678; 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=0o1UtXDWW0ruD/g6MFdjS43JbGPfrQUn7J4BSYhpmws=; b=JyOdEDTV9wHZSCV9/Dkt4FNqpYHe6OZmTgt1/cSXyumnHvaJJQblPKgQs5rUjTUKq3K0JStute3Y2oKvC+4XWqFgtFNvcW+KdWBFvDfmKKc7bV/hcQfY3+ZTpzol3BtriQqbpveleP3cv6DQ5mJLowdi6T6w2BlBetiReRyk2bE= 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 1570813678314774.9312735219023; Fri, 11 Oct 2019 10:07:58 -0700 (PDT) Received: from localhost ([::1]:54372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyOS-0005Yj-Hl for importer@patchew.org; Fri, 11 Oct 2019 13:07:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37255) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRK-0006we-Uj for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxRJ-0004wI-4b for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:50 -0400 Received: from relay.sw.ru ([185.231.240.75]:48516) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxRI-0004Yu-Sf; Fri, 11 Oct 2019 12:06:49 -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 1iIxQx-0003XG-IF; Fri, 11 Oct 2019 19:06:27 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 094/126] RBD: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:20 +0300 Message-Id: <20191011160552.22907-95-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 , Jason Dillaman 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/rbd.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 057af43d48..fc821da17e 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -428,10 +428,10 @@ static int coroutine_fn qemu_rbd_co_create_opts(const= char *filename, QemuOpts *opts, Error **errp) { + ERRP_AUTO_PROPAGATE(); BlockdevCreateOptions *create_options; BlockdevCreateOptionsRbd *rbd_opts; BlockdevOptionsRbd *loc; - Error *local_err =3D NULL; const char *keypairs, *password_secret; QDict *options =3D NULL; int ret =3D 0; @@ -452,10 +452,9 @@ static int coroutine_fn qemu_rbd_co_create_opts(const = char *filename, rbd_opts->has_cluster_size =3D (rbd_opts->cluster_size !=3D 0); =20 options =3D qdict_new(); - qemu_rbd_parse_filename(filename, options, &local_err); - if (local_err) { + qemu_rbd_parse_filename(filename, options, errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto exit; } =20 @@ -572,8 +571,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioc= tx_t *io_ctx, const char *keypairs, const char *secretid, Error **errp) { + ERRP_AUTO_PROPAGATE(); char *mon_host =3D NULL; - Error *local_err =3D NULL; int r; =20 if (secretid) { @@ -586,9 +585,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioc= tx_t *io_ctx, opts->has_key_secret =3D true; } =20 - mon_host =3D qemu_rbd_mon_host(opts, &local_err); - if (local_err) { - error_propagate(errp, local_err); + mon_host =3D qemu_rbd_mon_host(opts, errp); + if (*errp) { r =3D -EINVAL; goto failed_opts; } @@ -660,8 +658,8 @@ failed_opts: static int qemu_rbd_convert_options(QDict *options, BlockdevOptionsRbd **o= pts, Error **errp) { + ERRP_AUTO_PROPAGATE(); Visitor *v; - Error *local_err =3D NULL; =20 /* Convert the remaining options into a QAPI object */ v =3D qobject_input_visitor_new_flat_confused(options, errp); @@ -669,11 +667,10 @@ static int qemu_rbd_convert_options(QDict *options, B= lockdevOptionsRbd **opts, return -EINVAL; } =20 - visit_type_BlockdevOptionsRbd(v, NULL, opts, &local_err); + visit_type_BlockdevOptionsRbd(v, NULL, opts, errp); visit_free(v); =20 - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { return -EINVAL; } =20 @@ -710,10 +707,10 @@ static int qemu_rbd_attempt_legacy_options(QDict *opt= ions, static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { + ERRP_AUTO_PROPAGATE(); BDRVRBDState *s =3D bs->opaque; BlockdevOptionsRbd *opts =3D NULL; const QDictEntry *e; - Error *local_err =3D NULL; char *keypairs, *secretid; int r; =20 @@ -727,13 +724,12 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, qdict_del(options, "password-secret"); } =20 - r =3D qemu_rbd_convert_options(options, &opts, &local_err); - if (local_err) { + r =3D qemu_rbd_convert_options(options, &opts, errp); + if (*errp) { /* If keypairs are present, that means some options are present in * the modern option format. Don't attempt to parse legacy option * formats, as we won't support mixed usage. */ if (keypairs) { - error_propagate(errp, local_err); goto out; } =20 @@ -746,7 +742,6 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, if (r < 0) { /* Propagate the original error, not the legacy parsing fallba= ck * error, as the latter was just a best-effort attempt. */ - error_propagate(errp, local_err); goto out; } /* Take care whenever deciding to actually deprecate; once this ab= ility --=20 2.21.0