From nobody Mon Feb 9 01:19:52 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=1570815129; cv=none; d=zoho.com; s=zohoarc; b=mGnvyUG9JGXy6djSZHKPB0g9vO+0vqR9A2gQnWcsmVmRmzC8BoBwyuw7oHhy0ETr3tZndSmGUEtG5HDYZJFeo/waHBmhofMNZAMeyrtIjtosFYsVw5qC8tDeb7WnFBBtuWk/d2nimsJ11POdWJk7wMMa3s0rYDUBTI5z+V3wnSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570815129; 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=NlD71UNY85Mjq0Lf9JlOrfyV3fN5qRM1UtsyrM4I01g=; b=ZCQ7nnLsKf3ClgpIqXPZ6Mwzfwh45vQOyu9QgwSNDHzjE/YQLybkkOpoI+q81KkkDdLgrclSiS1hKnq/KwaVAMCtSHiW7+H8yNMD5FbMEzvzmbuivWDcyf1mskyY7b9tw72b7IDcsdbdVvLfCH3WqYRYfQaSPhj6gXl7+PIEEF0= 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 1570815129556158.37159807775174; Fri, 11 Oct 2019 10:32:09 -0700 (PDT) Received: from localhost ([::1]:54698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIylr-0002YU-OU for importer@patchew.org; Fri, 11 Oct 2019 13:32:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxgy-0000cs-5r for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxgw-00088V-Mu for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:23:00 -0400 Received: from relay.sw.ru ([185.231.240.75]:49666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxgw-000886-Fo; Fri, 11 Oct 2019 12:22:58 -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 1iIxR4-0003XG-L5; Fri, 11 Oct 2019 19:06:34 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 107/126] blklogwrites: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:33 +0300 Message-Id: <20191011160552.22907-108-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 , Ari Sundholm 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/blklogwrites.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/block/blklogwrites.c b/block/blklogwrites.c index 04d8b33607..841cfeef95 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -141,36 +141,33 @@ static uint64_t blk_log_writes_find_cur_log_sector(Bd= rvChild *log, static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int f= lags, Error **errp) { + ERRP_AUTO_PROPAGATE(); BDRVBlkLogWritesState *s =3D bs->opaque; QemuOpts *opts; - Error *local_err =3D NULL; int ret; uint64_t log_sector_size; bool log_append; =20 opts =3D qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); - qemu_opts_absorb_qdict(opts, options, &local_err); - if (local_err) { + qemu_opts_absorb_qdict(opts, options, errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto fail; } =20 /* Open the file */ bs->file =3D bdrv_open_child(NULL, options, "file", bs, &child_file, f= alse, - &local_err); - if (local_err) { + errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto fail; } =20 /* Open the log file */ s->log_file =3D bdrv_open_child(NULL, options, "log", bs, &child_file,= false, - &local_err); - if (local_err) { + errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto fail; } =20 @@ -220,10 +217,9 @@ static int blk_log_writes_open(BlockDriverState *bs, Q= Dict *options, int flags, if (blk_log_writes_sector_size_valid(log_sector_size)) { s->cur_log_sector =3D blk_log_writes_find_cur_log_sector(s->log_file, log_sector= _size, - le64_to_cpu(log_sb.nr_entries), &local= _err); - if (local_err) { + le64_to_cpu(log_sb.nr_entries), errp); + if (*errp) { ret =3D -EINVAL; - error_propagate(errp, local_err); goto fail_log; } =20 --=20 2.21.0