From nobody Sun Feb 8 21:47:35 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=1570812960; cv=none; d=zoho.com; s=zohoarc; b=AEs00d58yaiAYBp5xkvhchIDY8zwmqk8ai3ULUhIHHIc97Vo/TCMUeYUzP3RNJFaj1ULrsK4uP7jZOSvRFIWyEXPPpB12fORHPzXAx/hEkigNBZTffTxo+zOmgU9smHfZVTq7PYpIX5cxnGDDfVPfMItLEb84/jWCgbnnG6stVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570812960; 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=QCqRGKsx0jc8Ak1P3E0Ufow5rUgj/Gha47Jc8n1m/ZE=; b=BoEp1Mbs9kli5bubeCLOhhoFBLIp3kCXbC8VeuuF3iNeDYdVvCDBvQsgl1L3Z+CZIQYOTRYaSN2zrRD5O4X2GEleiJh/px+dKfZaYgfys6Af/zeoNfEX/0FYLtxQg0cjZ2TjQLkK266PsnknirLm0wy7ryJDHsETBy0pehG5KpM= 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 1570812960697669.957653596316; Fri, 11 Oct 2019 09:56:00 -0700 (PDT) Received: from localhost ([::1]:54218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyCo-00056R-Fg for importer@patchew.org; Fri, 11 Oct 2019 12:55:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36903) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRA-0006eS-9V for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR6-0004lw-No for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:40 -0400 Received: from relay.sw.ru ([185.231.240.75]:48136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR6-0004HR-Eu; Fri, 11 Oct 2019 12:06:36 -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 1iIxQk-0003XG-Ud; Fri, 11 Oct 2019 19:06:15 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 056/126] virtio-ccw: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:42 +0300 Message-Id: <20191011160552.22907-57-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, "Michael S. Tsirkin" , Cornelia Huck , David Hildenbrand , armbru@redhat.com, Greg Kurz , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson 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/s390x/virtio-ccw-crypto.c | 7 +++---- hw/s390x/virtio-ccw-rng.c | 7 +++---- hw/s390x/virtio-ccw.c | 13 ++++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c index 086b397ad2..b942179f3f 100644 --- a/hw/s390x/virtio-ccw-crypto.c +++ b/hw/s390x/virtio-ccw-crypto.c @@ -17,14 +17,13 @@ =20 static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **er= rp) { + ERRP_AUTO_PROPAGATE(); VirtIOCryptoCcw *dev =3D VIRTIO_CRYPTO_CCW(ccw_dev); DeviceState *vdev =3D DEVICE(&dev->vdev); - Error *err =3D NULL; =20 qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); - object_property_set_bool(OBJECT(vdev), true, "realized", &err); - if (err) { - error_propagate(errp, err); + object_property_set_bool(OBJECT(vdev), true, "realized", errp); + if (*errp) { return; } =20 diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c index 854254dd50..bc242f1fc6 100644 --- a/hw/s390x/virtio-ccw-rng.c +++ b/hw/s390x/virtio-ccw-rng.c @@ -18,14 +18,13 @@ =20 static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); VirtIORNGCcw *dev =3D VIRTIO_RNG_CCW(ccw_dev); DeviceState *vdev =3D DEVICE(&dev->vdev); - Error *err =3D NULL; =20 qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); - object_property_set_bool(OBJECT(vdev), true, "realized", &err); - if (err) { - error_propagate(errp, err); + object_property_set_bool(OBJECT(vdev), true, "realized", errp); + if (*errp) { return; } =20 diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 6580ce5907..3d80b27ef5 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -692,18 +692,18 @@ static void virtio_sch_disable_cb(SubchDev *sch) =20 static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp) { + ERRP_AUTO_PROPAGATE(); VirtIOCCWDeviceClass *k =3D VIRTIO_CCW_DEVICE_GET_CLASS(dev); CcwDevice *ccw_dev =3D CCW_DEVICE(dev); CCWDeviceClass *ck =3D CCW_DEVICE_GET_CLASS(ccw_dev); SubchDev *sch; - Error *err =3D NULL; =20 sch =3D css_create_sch(ccw_dev->devno, errp); if (!sch) { return; } if (!virtio_ccw_rev_max(dev) && dev->force_revision_1) { - error_setg(&err, "Invalid value of property max_rev " + error_setg(errp, "Invalid value of property max_rev " "(is %d expected >=3D 1)", virtio_ccw_rev_max(dev)); goto out_err; } @@ -728,21 +728,20 @@ static void virtio_ccw_device_realize(VirtioCcwDevice= *dev, Error **errp) } =20 if (k->realize) { - k->realize(dev, &err); - if (err) { + k->realize(dev, errp); + if (*errp) { goto out_err; } } =20 - ck->realize(ccw_dev, &err); - if (err) { + ck->realize(ccw_dev, errp); + if (*errp) { goto out_err; } =20 return; =20 out_err: - error_propagate(errp, err); css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL); ccw_dev->sch =3D NULL; g_free(sch); --=20 2.21.0