From nobody Sun Feb 8 22:07:20 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=1570815125; cv=none; d=zoho.com; s=zohoarc; b=LdydwzkS5rGL8SznX2m5Xw+bC4klDI/6WBLgPBj0vo5BX/6mQ+CVVDkjr1g2EjjiIyHumrqa3koE5EhTTkJwQcTQBp0yoC1k4T+zk3MbrCvTJgCgAJnLOsxcMnv7L30l3f3RmvmpmiU/BftQyUCoIyfbjTs2PbOAGqkvANQWAnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570815125; 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=aYHCbr94O96vJbcGNmpiy9Yjmt46UDFOQEa/j3xHXeg=; b=AX8pdVCljlZfX6mEuz1k+2NJVfliiWUFFd1bflvNx76sY6UeK2bMOgpaijDX1vP9BgzRhd5wgoT2OWHRRaK4z/7fXsliNmXesbmHetid3EZeFx0XfduWnMRKroT+CODAcgpdJ092EzbbP0z6wu1dHZMMyvPlXhoSQAGZBG7eb08= 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 1570815125635808.7499412724067; Fri, 11 Oct 2019 10:32:05 -0700 (PDT) Received: from localhost ([::1]:54696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyln-0002Te-T8 for importer@patchew.org; Fri, 11 Oct 2019 13:32:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37015) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxRD-0006jZ-3z for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR8-0004ox-VP for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:42 -0400 Received: from relay.sw.ru ([185.231.240.75]:47926) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR8-000499-NT; Fri, 11 Oct 2019 12:06:38 -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 1iIxQd-0003XG-6W; Fri, 11 Oct 2019 19:06:07 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 030/126] kvm: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:16 +0300 Message-Id: <20191011160552.22907-31-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, David Hildenbrand , Cornelia Huck , armbru@redhat.com, Greg Kurz , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Richard Henderson , David Gibson 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 Reviewed-by: Cornelia Huck --- target/ppc/kvm.c | 8 ++++---- target/s390x/cpu_models.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index af6e667bf8..d58a3f5bf5 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -237,6 +237,7 @@ static int kvm_booke206_tlb_init(PowerPCCPU *cpu) #if defined(TARGET_PPC64) static void kvm_get_smmu_info(struct kvm_ppc_smmu_info *info, Error **errp) { + ERRP_AUTO_PROPAGATE(); int ret; =20 assert(kvm_state !=3D NULL); @@ -325,18 +326,17 @@ bool kvmppc_hpt_needs_host_contiguous_pages(void) =20 void kvm_check_mmu(PowerPCCPU *cpu, Error **errp) { + ERRP_AUTO_PROPAGATE(); struct kvm_ppc_smmu_info smmu_info; int iq, ik, jq, jk; - Error *local_err =3D NULL; =20 /* For now, we only have anything to check on hash64 MMUs */ if (!cpu->hash64_opts || !kvm_enabled()) { return; } =20 - kvm_get_smmu_info(&smmu_info, &local_err); - if (local_err) { - error_propagate(errp, local_err); + kvm_get_smmu_info(&smmu_info, errp); + if (*errp) { return; } =20 diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 009afc38b9..32f2e5e822 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -840,6 +840,7 @@ static void error_prepend_missing_feat(const char *name= , void *opaque) static void check_compatibility(const S390CPUModel *max_model, const S390CPUModel *model, Error **errp) { + ERRP_AUTO_PROPAGATE(); S390FeatBitmap missing; =20 if (model->def->gen > max_model->def->gen) { @@ -922,6 +923,7 @@ static inline void apply_cpu_model(const S390CPUModel *= model, Error **errp) =20 void s390_realize_cpu_model(CPUState *cs, Error **errp) { + ERRP_AUTO_PROPAGATE(); S390CPUClass *xcc =3D S390_CPU_GET_CLASS(cs); S390CPU *cpu =3D S390_CPU(cs); const S390CPUModel *max_model; --=20 2.21.0