From nobody Mon Feb 9 02:51:03 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=1570817128; cv=none; d=zoho.com; s=zohoarc; b=fxZOVxTdquDdDImzqAxC31p6+F5vBVQVAodXgQiKSY/nl+riA87SwaAIm2cd3dK/d34l76SWlTAn42NRwXhxlVMLVsdTdh/GquJEz7Qkut0KOBMzR+TBvTAddTbEC1mMTLxe14aih86u9iSz42rKNNyEJzBF+TaYy04FMqzYlF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570817128; 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=2Ivl1QaO8wuhUwDHV+VzpKtJWcIsH/0z/zIiPFA8RxY=; b=lsNLmUR8ntrto7734MaIg2e0BhVNaERrRuSmbR7+0kx0l33g2KEsO21o5P/3UytWbqduIVqlUR/FgQy8EICXKbdex2oe4FfgU14pcRvRfBxjW0P+va9MhQk02VcE/AO62cB15+OnkZe7shEEPE95DSO1XeGIIHjJDtsfH+LxvHQ= 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 1570817128101758.6381649581222; Fri, 11 Oct 2019 11:05:28 -0700 (PDT) Received: from localhost ([::1]:55110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIzI6-0007Xg-N6 for importer@patchew.org; Fri, 11 Oct 2019 14:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40341) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxgW-0008RC-L7 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxgV-0007xq-9l for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:22:32 -0400 Received: from relay.sw.ru ([185.231.240.75]:49626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxgV-0007xf-2k; Fri, 11 Oct 2019 12:22:31 -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 1iIxR7-0003XG-TB; Fri, 11 Oct 2019 19:06:37 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 115/126] vpc: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:41 +0300 Message-Id: <20191011160552.22907-116-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 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/vpc.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 5cd3890780..c685a9ae41 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -213,12 +213,12 @@ static void vpc_parse_options(BlockDriverState *bs, Q= emuOpts *opts, static int vpc_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { + ERRP_AUTO_PROPAGATE(); BDRVVPCState *s =3D bs->opaque; int i; VHDFooter *footer; VHDDynDiskHeader *dyndisk_header; QemuOpts *opts =3D NULL; - Error *local_err =3D NULL; bool use_chs; uint8_t buf[HEADER_SIZE]; uint32_t checksum; @@ -235,16 +235,14 @@ static int vpc_open(BlockDriverState *bs, QDict *opti= ons, int flags, } =20 opts =3D qemu_opts_create(&vpc_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 - vpc_parse_options(bs, opts, &local_err); - if (local_err) { - error_propagate(errp, local_err); + vpc_parse_options(bs, opts, errp); + if (*errp) { ret =3D -EINVAL; goto fail; } @@ -448,9 +446,8 @@ static int vpc_open(BlockDriverState *bs, QDict *option= s, int flags, error_setg(&s->migration_blocker, "The vpc format used by node '%s' " "does not support live migration", bdrv_get_device_or_node_name(bs)); - ret =3D migrate_add_blocker(s->migration_blocker, &local_err); - if (local_err) { - error_propagate(errp, local_err); + ret =3D migrate_add_blocker(s->migration_blocker, errp); + if (*errp) { error_free(s->migration_blocker); goto fail; } @@ -971,6 +968,7 @@ static int calculate_rounded_image_size(BlockdevCreateO= ptionsVpc *vpc_opts, static int coroutine_fn vpc_co_create(BlockdevCreateOptions *opts, Error **errp) { + ERRP_AUTO_PROPAGATE(); BlockdevCreateOptionsVpc *vpc_opts; BlockBackend *blk =3D NULL; BlockDriverState *bs =3D NULL; @@ -1092,11 +1090,11 @@ out: static int coroutine_fn vpc_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 { @@ -1113,9 +1111,8 @@ static int coroutine_fn vpc_co_create_opts(const char= *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 @@ -1136,11 +1133,10 @@ static int coroutine_fn vpc_co_create_opts(const ch= ar *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; } --=20 2.21.0