From nobody Sun Feb 8 17:47:54 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=1570811847; cv=none; d=zoho.com; s=zohoarc; b=FU66QJrZ1tA2D/kdpZCqOMnTDDb2ZxxuZcO9TX+eDyQ1ZF/z7YWVZYKieGkMrI3GjqZKHiUnYcT1LAadDVAGAaziRlwi2pHoQ+LLeLecpFBGohOslMw5/qK8xcCr+M+/c4jS9s3QPEQ8jQrmmItrQr/j/qyBrWSe5HME1RnpSiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570811847; 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=pPN2XLySI87oK7v3BHfcnvNOWTswfnF6aHvhmwdD5k4=; b=GSNxAE/aEnY18B6wx8co2AlSlMZyGH5hvsUHZIONoi/i9XduHhjbf36aTu8d2bsYDfGKNcJyqdsg2K7uilWpJzAHPoqbcOSNuzC6jy2cQz4Cp4/xdDLyLOdkDC5RZHIqJ2pNbtgSTTmcwOH4WneHC8k4oKWk0xyxq/KikM+MPGY= 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 1570811847523446.95029389271997; Fri, 11 Oct 2019 09:37:27 -0700 (PDT) Received: from localhost ([::1]:53992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxuv-0007wv-RD for importer@patchew.org; Fri, 11 Oct 2019 12:37:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36628) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR2-0006Qy-JX for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR1-0004e2-D3 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:32 -0400 Received: from relay.sw.ru ([185.231.240.75]:47980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR1-0004B5-5J; Fri, 11 Oct 2019 12:06: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 1iIxQf-0003XG-RV; Fri, 11 Oct 2019 19:06:09 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 039/126] IDE: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:25 +0300 Message-Id: <20191011160552.22907-40-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, Greg Kurz , John Snow 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 --- hw/ide/qdev.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 6fba6b62b8..9e5ed9914f 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -233,18 +233,18 @@ static void ide_dev_get_bootindex(Object *obj, Visito= r *v, const char *name, static void ide_dev_set_bootindex(Object *obj, Visitor *v, const char *nam= e, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); IDEDevice *d =3D IDE_DEVICE(obj); int32_t boot_index; - Error *local_err =3D NULL; =20 - visit_type_int32(v, name, &boot_index, &local_err); - if (local_err) { - goto out; + visit_type_int32(v, name, &boot_index, errp); + if (*errp) { + return; } /* check whether bootindex is present in fw_boot_order list */ - check_boot_index(boot_index, &local_err); - if (local_err) { - goto out; + check_boot_index(boot_index, errp); + if (*errp) { + return; } /* change bootindex to a new one */ d->conf.bootindex =3D boot_index; @@ -253,8 +253,6 @@ static void ide_dev_set_bootindex(Object *obj, Visitor = *v, const char *name, add_boot_device_path(d->conf.bootindex, &d->qdev, d->unit ? "/disk@1" : "/disk@0"); } -out: - error_propagate(errp, local_err); } =20 static void ide_dev_instance_init(Object *obj) --=20 2.21.0