From nobody Mon Feb 9 10:28:38 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=1570813745; cv=none; d=zoho.com; s=zohoarc; b=QPYn69/E9zw3h8rVgUBWPdCiZONCb3tpYItHXo6xCrkZa177WCkMnwbSTTVSrLZAF+dbid/9m1lg1BxCWFoN+FpgEoN21VSf/UfgbhNP9wgzDQn+trpvmsMG082tvhWSn83Uuj0PvfQQMlQ4s8KxEivtg1hL4WLQCnVfXf31JPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813745; 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=P91owZJMHvzFTPO55S1Y7LAceVJ6BgmVGi2AMAop30s=; b=Kpd7kkrpiL6zC4vHotXo5kGnF1TnLEuzO7zXdzra5verysufxw7PFVISOOxq+dAOIraLX8pTVedBc9SrALGX20ZZYpR9+yldSdWOah8rmpIEqFK5af99H9c3/e9e8KISogqad/ehGPwOLRj2MxkKigReOAf6tTAQmC/iIQB5Cw8= 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 1570813745454182.0133109080275; Fri, 11 Oct 2019 10:09:05 -0700 (PDT) Received: from localhost ([::1]:54384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyPW-0007EY-Tr for importer@patchew.org; Fri, 11 Oct 2019 13:09:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36719) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR5-0006VR-8m for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR3-0004ge-5B for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:35 -0400 Received: from relay.sw.ru ([185.231.240.75]:48336) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR2-0004OA-Tz for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:33 -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 1iIxQr-0003XG-JP; Fri, 11 Oct 2019 19:06:21 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 075/126] Main loop: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:01 +0300 Message-Id: <20191011160552.22907-76-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 , Paolo Bonzini , 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 --- util/main-loop.c | 5 ++--- vl.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/util/main-loop.c b/util/main-loop.c index e3eaa55866..fdd7f50fc8 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -145,9 +145,9 @@ static GArray *gpollfds; =20 int qemu_init_main_loop(Error **errp) { + ERRP_AUTO_PROPAGATE(); int ret; GSource *src; - Error *local_error =3D NULL; =20 init_clocks(qemu_timer_notify_cb); =20 @@ -156,9 +156,8 @@ int qemu_init_main_loop(Error **errp) return ret; } =20 - qemu_aio_context =3D aio_context_new(&local_error); + qemu_aio_context =3D aio_context_new(errp); if (!qemu_aio_context) { - error_propagate(errp, local_error); return -EMFILE; } qemu_notify_bh =3D qemu_bh_new(notify_event_cb, NULL); diff --git a/vl.c b/vl.c index 002bf4919e..7499ff5691 100644 --- a/vl.c +++ b/vl.c @@ -2213,11 +2213,10 @@ static int device_init_func(void *opaque, QemuOpts = *opts, Error **errp) =20 static int chardev_init_func(void *opaque, QemuOpts *opts, Error **errp) { - Error *local_err =3D NULL; + ERRP_AUTO_PROPAGATE(); =20 - if (!qemu_chr_new_from_opts(opts, NULL, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); + if (!qemu_chr_new_from_opts(opts, NULL, errp)) { + if (*errp) { return -1; } exit(0); @@ -2613,8 +2612,8 @@ static int machine_set_property(void *opaque, const char *name, const char *value, Error **errp) { + ERRP_AUTO_PROPAGATE(); Object *obj =3D OBJECT(opaque); - Error *local_err =3D NULL; char *p, *qom_name; =20 if (strcmp(name, "type") =3D=3D 0) { @@ -2628,11 +2627,10 @@ static int machine_set_property(void *opaque, } } =20 - object_property_parse(obj, value, qom_name, &local_err); + object_property_parse(obj, value, qom_name, errp); g_free(qom_name); =20 - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { return -1; } =20 --=20 2.21.0