From nobody Sun Feb 8 14:52:16 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=1570812624; cv=none; d=zoho.com; s=zohoarc; b=hSXwVpKW4f5nTgmwPApvieIBz1lzsu12OauMxgW37ahxk3W7cgaCj+q2NNvJAQyiDmXME+hTlZfkuk0KkxvWR2UGmuEpZIwR2xykuugO9Ry4+c1U1HDQopvoSCCceYmrjtCn+HBZP9vT1j8ywpWCprwictaU9Ra+HOCSiTZb5aA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570812624; 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=HoBZm2v4WBI810aZB0d/iW5SpYbwW2DPB5EqCHtthNc=; b=B+k5KcJr2o/1YXH/YNadtnFu+dAHRDC/pv+q+hEkCSajmHhduX61uff001d7afsVcSTjoTd2Tsz4HF6wMtvOaGQUCyYk0Y+YH/iin+yU9uUIVWuPnqXU5jvEoEJu3V5s2siVly7+sFwJnrq3JNKTfOXDgNMISZ9lVs4Y+hcL/v8= 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 1570812624307228.06617084256823; Fri, 11 Oct 2019 09:50:24 -0700 (PDT) Received: from localhost ([::1]:54158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIy7S-0006DB-Ju for importer@patchew.org; Fri, 11 Oct 2019 12:50:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR9-0006dN-Kc for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR6-0004m2-PZ for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:39 -0400 Received: from relay.sw.ru ([185.231.240.75]:48422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR6-0004TB-GT for qemu-devel@nongnu.org; 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 1iIxQu-0003XG-IJ; Fri, 11 Oct 2019 19:06:24 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 084/126] SLIRP: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:10 +0300 Message-Id: <20191011160552.22907-85-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, Jan Kiszka , Jason Wang , armbru@redhat.com, Greg Kurz , Samuel Thibault 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 --- net/slirp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index c4334ee876..cbde9ba2a9 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -941,6 +941,7 @@ static ssize_t guestfwd_write(const void *buf, size_t l= en, void *chr) =20 static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **e= rrp) { + ERRP_AUTO_PROPAGATE(); /* TODO: IPv6 */ struct in_addr server =3D { .s_addr =3D 0 }; struct GuestFwd *fwd; @@ -979,7 +980,6 @@ static int slirp_guestfwd(SlirpState *s, const char *co= nfig_str, Error **errp) return -1; } } else { - Error *err =3D NULL; /* * FIXME: sure we want to support implicit * muxed monitors here? @@ -993,9 +993,8 @@ static int slirp_guestfwd(SlirpState *s, const char *co= nfig_str, Error **errp) } =20 fwd =3D g_new(struct GuestFwd, 1); - qemu_chr_fe_init(&fwd->hd, chr, &err); - if (err) { - error_propagate(errp, err); + qemu_chr_fe_init(&fwd->hd, chr, errp); + if (*errp) { object_unparent(OBJECT(chr)); g_free(fwd); return -1; --=20 2.21.0