From nobody Mon Feb 9 02:51: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=1570813024; cv=none; d=zoho.com; s=zohoarc; b=bxGwEw5Tvzmk7Bz3348ba2fEI/mb1JZ2oT/SAP/yKpNKmMzU76yEagMuKvaSoZIhVaw0Skv9SacCjtpa5wpkPK6hjQ9ldxYPniDb8K/h5hAkROMCPOj5/3jquDJnltGR2lX65Btr1YU9yV49ULaTCGmg5Of+sJ6K/NFMm1S+NAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813024; 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=VwhAEDDSan+SwEwHX5o1NCuNE8BuKLpwzTPcefCPfSc=; b=bQPfyJnDCKE3cIDIS6K7x+zNUXbbrHu8jmxU3ogM7aPeNXl8VqqytlCxdMXulKHJMhfYkmxcjSsCf18XdBkkYXSUa5sQzjwPWG6z6G2YwgxF+mXR+2GkIa57Vreye+ddP/4vO5bVX6OVCspMiZtOgD+BbNRynAovVj4eqOgNV5E= 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 1570813024005757.8649038244686; Fri, 11 Oct 2019 09:57:04 -0700 (PDT) Received: from localhost ([::1]:54232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyDt-00072g-W0 for importer@patchew.org; Fri, 11 Oct 2019 12:57:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36902) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRA-0006eQ-A9 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-0004lr-NN for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:40 -0400 Received: from relay.sw.ru ([185.231.240.75]:48436) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR6-0004Tt-Dr 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-VF; Fri, 11 Oct 2019 19:06:25 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 085/126] Tracing: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:05:11 +0300 Message-Id: <20191011160552.22907-86-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, Stefan Hajnoczi , 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 --- trace/qmp.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/trace/qmp.c b/trace/qmp.c index 38246e1aa6..05335f2da4 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -70,7 +70,7 @@ TraceEventInfoList *qmp_trace_event_get_state(const char = *name, bool has_vcpu, int64_t vcpu, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); TraceEventInfoList *events =3D NULL; TraceEventIter iter; TraceEvent *ev; @@ -78,9 +78,8 @@ TraceEventInfoList *qmp_trace_event_get_state(const char = *name, CPUState *cpu; =20 /* Check provided vcpu */ - cpu =3D get_cpu(has_vcpu, vcpu, &err); - if (err) { - error_propagate(errp, err); + cpu =3D get_cpu(has_vcpu, vcpu, errp); + if (*errp) { return NULL; } =20 @@ -135,16 +134,15 @@ void qmp_trace_event_set_state(const char *name, bool= enable, bool has_vcpu, int64_t vcpu, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); TraceEventIter iter; TraceEvent *ev; bool is_pattern =3D trace_event_is_pattern(name); CPUState *cpu; =20 /* Check provided vcpu */ - cpu =3D get_cpu(has_vcpu, vcpu, &err); - if (err) { - error_propagate(errp, err); + cpu =3D get_cpu(has_vcpu, vcpu, errp); + if (*errp) { return; } =20 --=20 2.21.0