From nobody Sun Feb 8 20:34:09 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=1570818245; cv=none; d=zoho.com; s=zohoarc; b=U/PdflSUmS6zCC5hQPUFD9xTRqOsxw89rSS21aD4lbc50AkW9bi/MMJ4JZSwtvrOL9LpIYIPvd27ptodPCL/yuZjuKzBok8VQfF621+NnfWdcJC2M0pQg+b5qvsbNpT1W21rql0NPBfZYNOy0R0eLzyy6nSyXP8cDbOz+GBjMcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570818245; 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=hEg2N4Z3c8xxUCWulPOwFv/LAVJFeb8TNU1pQvhBUvM=; b=SE1BV8WUxTfU0jnczH2wYHhMedu+8wLq1UvkHStopGGuIYOfjAcZQbdKofi9+rdf+x/R2bV3vC+ky4hWmBpTCqlMzuAzHEcAwSZPNQ3/3VNqrgokcbkpd9YxF70xZUiSbgFuujjl+J5CdmCfpTCVQ6J4kw/JjrIG6tjKfxfm768= 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 1570818245675190.6862993955259; Fri, 11 Oct 2019 11:24:05 -0700 (PDT) Received: from localhost ([::1]:55392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIza8-0005RD-H2 for importer@patchew.org; Fri, 11 Oct 2019 14:24:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40488) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxgu-0000Um-8F for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:22:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxgs-00086y-O6 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:22:56 -0400 Received: from relay.sw.ru ([185.231.240.75]:49656) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxgs-00086p-H3 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:22:54 -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 1iIxR9-0003XG-CQ; Fri, 11 Oct 2019 19:06:39 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 122/126] iothread.c: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:48 +0300 Message-Id: <20191011160552.22907-123-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, armbru@redhat.com, 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 --- iothread.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/iothread.c b/iothread.c index 7130be58e3..726b60df53 100644 --- a/iothread.c +++ b/iothread.c @@ -163,15 +163,14 @@ static void iothread_init_gcontext(IOThread *iothread) =20 static void iothread_complete(UserCreatable *obj, Error **errp) { - Error *local_error =3D NULL; + ERRP_AUTO_PROPAGATE(); IOThread *iothread =3D IOTHREAD(obj); char *name, *thread_name; =20 iothread->stopping =3D false; iothread->running =3D true; - iothread->ctx =3D aio_context_new(&local_error); + iothread->ctx =3D aio_context_new(errp); if (!iothread->ctx) { - error_propagate(errp, local_error); return; } =20 @@ -185,9 +184,8 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) iothread->poll_max_ns, iothread->poll_grow, iothread->poll_shrink, - &local_error); - if (local_error) { - error_propagate(errp, local_error); + errp); + if (*errp) { aio_context_unref(iothread->ctx); iothread->ctx =3D NULL; return; @@ -237,21 +235,21 @@ static void iothread_get_poll_param(Object *obj, Visi= tor *v, static void iothread_set_poll_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); IOThread *iothread =3D IOTHREAD(obj); PollParamInfo *info =3D opaque; int64_t *field =3D (void *)iothread + info->offset; - Error *local_err =3D NULL; int64_t value; =20 - visit_type_int64(v, name, &value, &local_err); - if (local_err) { - goto out; + visit_type_int64(v, name, &value, errp); + if (*errp) { + return; } =20 if (value < 0) { - error_setg(&local_err, "%s value must be in range [0, %"PRId64"]", + error_setg(errp, "%s value must be in range [0, %"PRId64"]", info->name, INT64_MAX); - goto out; + return; } =20 *field =3D value; @@ -261,11 +259,8 @@ static void iothread_set_poll_param(Object *obj, Visit= or *v, iothread->poll_max_ns, iothread->poll_grow, iothread->poll_shrink, - &local_err); + errp); } - -out: - error_propagate(errp, local_err); } =20 static void iothread_class_init(ObjectClass *klass, void *class_data) --=20 2.21.0