From nobody Sat Nov 15 14:11:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595407361; cv=none; d=zohomail.com; s=zohoarc; b=Kln9zjYe03OQA0lhr9o+8IjDa2SCB6S3B2MFbcwQRsGSwyDcJ6iLt2k4A7UWaebMB0mk7Th8lTzhmcC3nn7d9d7ZfaEUb2zET6pdEP+nePCaB9z92iPB3o/OmGZGZUJpu+Rg+XBp1hvzDSqYebm3eR15O41W852qUwcff+MnhG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595407361; h=Content-Type:Content-Transfer-Encoding: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=v4qjKJe9vEQSPCqLFgJL2Yoi057G7kUTdd4SX34/9jU=; b=CHusb6IOwIROP1QSvQq7nB756nkAZZSZF93Z6RBqCq1/LKslFDYhc7PFhsCVlnJ0Xkf+0t8yqmta6HE8qI9qxUoGvj7PBUDz7Iqe7dPEcDzWA5zuvds91z92BxicyC+IrgJ4TqTP/qxFDYoT53HITzDaeAr1RluvFrx6HXjjDzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1595407361558631.6357170819474; Wed, 22 Jul 2020 01:42:41 -0700 (PDT) Received: from localhost ([::1]:46448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyAKm-0005T1-5j for importer@patchew.org; Wed, 22 Jul 2020 04:42:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyAJA-0003ms-OR for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:41:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:25145 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyAJ8-0000Np-GJ for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:41:00 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-502-HZ-1MavQMPCWARZ-oPH-jA-1; Wed, 22 Jul 2020 04:40:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 920E7107BF04 for ; Wed, 22 Jul 2020 08:40:50 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 671E55BAD5 for ; Wed, 22 Jul 2020 08:40:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 045BE10A5B7A; Wed, 22 Jul 2020 10:40:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595407253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v4qjKJe9vEQSPCqLFgJL2Yoi057G7kUTdd4SX34/9jU=; b=Eu1yy6JvBBIidnlBg4chCofpDousGgbaen+xTC0XNMXbdrGJcq6fu8c+poO+BMFU+GTjRF nd+MFyhtWrqv1mjimvMeytZaKrYlZuhHJ6yeXCpAkAiV490ALin/CVZ7zwz33MzTrQDmGl PL3GghwTVYx1GdUyuz09V2tHcuAJJYs= X-MC-Unique: HZ-1MavQMPCWARZ-oPH-jA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/4] coccinelle/err-bad-newline: Fix for Python 3, and add patterns Date: Wed, 22 Jul 2020 10:40:45 +0200 Message-Id: <20200722084048.1726105-2-armbru@redhat.com> In-Reply-To: <20200722084048.1726105-1-armbru@redhat.com> References: <20200722084048.1726105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 23:27:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/coccinelle/err-bad-newline.cocci | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/scripts/coccinelle/err-bad-newline.cocci b/scripts/coccinelle/= err-bad-newline.cocci index 1316cc86a6..5394421873 100644 --- a/scripts/coccinelle/err-bad-newline.cocci +++ b/scripts/coccinelle/err-bad-newline.cocci @@ -1,22 +1,42 @@ // Error messages should not contain newlines. This script finds // messages that do. Fixing them is manual. @r@ -expression errp, eno, cls, fmt; +expression errp, err, eno, cls, fmt, ap; position p; @@ ( +error_vreport(fmt, ap)@p +| +warn_vreport(fmt, ap)@p +| +info_vreport(fmt, ap)@p +| error_report(fmt, ...)@p | +warn_report(fmt, ...)@p +| +info_report(fmt, ...)@p +| +error_report_once(fmt, ...)@p +| +warn_report_once(fmt, ...)@p +| error_setg(errp, fmt, ...)@p | error_setg_errno(errp, eno, fmt, ...)@p | error_setg_win32(errp, eno, cls, fmt, ...)@p | +error_propagate_prepend(errp, err, fmt, ...)@p +| +error_vprepend(errp, fmt, ap)@p +| error_prepend(errp, fmt, ...)@p | error_setg_file_open(errp, eno, cls, fmt, ...)@p | +warn_reportf_err(errp, fmt, ...)@p +| error_reportf_err(errp, fmt, ...)@p | error_set(errp, cls, fmt, ...)@p @@ -26,4 +46,4 @@ fmt << r.fmt; p << r.p; @@ if "\\n" in str(fmt): - print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt) + print("%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)) --=20 2.26.2 From nobody Sat Nov 15 14:11:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595407361; cv=none; d=zohomail.com; s=zohoarc; b=GVx+3UQvZyDHqPPYfwu4xi1Z63nYiLB+T+p69Skf/x/Q8RHE/J11aqB7H1zVNHjkvQsOgZX4eszHFCIuqUrRoO30s7f4qyaqsfISWcM3kH4RkkyZjGrExj1fNlxNwko46FA5VeR7ay4R7ECo/VUovQRgRTQX6RpREdk4ndZq5VQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595407361; h=Content-Type: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=1AZwKAol2zP3kx72+lN4dzMd1pf+gShLnzFfE9RuXQ4=; b=CUzPfSPx+Mqa5vupGJv4C94mjWLQExAY1Z6rHmXZqWk+i+HRsq5taR8wCHvxAgrmaMl040tVdVDb2d1dm5SGRNL210vG1+NdQI2MADS8YNOdo/8rAXI6tI6a2M7wMXo8BoAWhFW/lAfVm2tAIXcA++vSUUv3Ff/389uii6NL88Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1595407361709914.9752791733918; Wed, 22 Jul 2020 01:42:41 -0700 (PDT) Received: from localhost ([::1]:46406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyAKm-0005Rs-Ey for importer@patchew.org; Wed, 22 Jul 2020 04:42:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyAJA-0003mb-Gp for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:41:00 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:37659 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyAJ7-0000OO-Od for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:41:00 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-KySZH7oPODG1FiKe3zZ_WA-1; Wed, 22 Jul 2020 04:40:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3419800C64; Wed, 22 Jul 2020 08:40:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA7B519C4F; Wed, 22 Jul 2020 08:40:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 07C8F107F757; Wed, 22 Jul 2020 10:40:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595407256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1AZwKAol2zP3kx72+lN4dzMd1pf+gShLnzFfE9RuXQ4=; b=eSH7/WKorpJV+plB1DueSWien6uLUf4Qc4AFgdUcnzXS35WijiaYxZpVfPM+Syx4tsefT3 aPJ34mf277tdPL2rkH7GAXW2laxa02EpZIOtY5vWfi/H69cKJUSmV14EHOw2bwZKSaduZA skwmpN1LaluGi7+90ErcGGHLVRaaXZ0= X-MC-Unique: KySZH7oPODG1FiKe3zZ_WA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/4] error: Strip trailing '\n' from error string arguments (again) Date: Wed, 22 Jul 2020 10:40:46 +0200 Message-Id: <20200722084048.1726105-3-armbru@redhat.com> In-Reply-To: <20200722084048.1726105-1-armbru@redhat.com> References: <20200722084048.1726105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 23:34:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Xu , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Tracked down with scripts/coccinelle/err-bad-newline.cocci. Cc: Peter Xu Cc: David Gibson Signed-off-by: Markus Armbruster Acked-by: David Gibson Reviewed-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/intel_iommu.c | 6 +++--- target/ppc/mmu-hash64.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index c56398e991..8cd9ed8d3b 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2356,7 +2356,7 @@ static bool vtd_process_iotlb_desc(IntelIOMMUState *s= , VTDInvDesc *inv_desc) if ((inv_desc->lo & VTD_INV_DESC_IOTLB_RSVD_LO) || (inv_desc->hi & VTD_INV_DESC_IOTLB_RSVD_HI)) { error_report_once("%s: invalid iotlb inv desc: hi=3D0x%"PRIx64 - ", lo=3D0x%"PRIx64" (reserved bits unzero)\n", + ", lo=3D0x%"PRIx64" (reserved bits unzero)", __func__, inv_desc->hi, inv_desc->lo); return false; } @@ -2377,7 +2377,7 @@ static bool vtd_process_iotlb_desc(IntelIOMMUState *s= , VTDInvDesc *inv_desc) am =3D VTD_INV_DESC_IOTLB_AM(inv_desc->hi); if (am > VTD_MAMV) { error_report_once("%s: invalid iotlb inv desc: hi=3D0x%"PRIx64 - ", lo=3D0x%"PRIx64" (am=3D%u > VTD_MAMV=3D%u= )\n", + ", lo=3D0x%"PRIx64" (am=3D%u > VTD_MAMV=3D%u= )", __func__, inv_desc->hi, inv_desc->lo, am, (unsigned)VTD_MAMV); return false; @@ -2387,7 +2387,7 @@ static bool vtd_process_iotlb_desc(IntelIOMMUState *s= , VTDInvDesc *inv_desc) =20 default: error_report_once("%s: invalid iotlb inv desc: hi=3D0x%"PRIx64 - ", lo=3D0x%"PRIx64" (type mismatch: 0x%llx)\n", + ", lo=3D0x%"PRIx64" (type mismatch: 0x%llx)", __func__, inv_desc->hi, inv_desc->lo, inv_desc->lo & VTD_INV_DESC_IOTLB_G); return false; diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index e5baabf0e1..c31d21e6a9 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -859,7 +859,7 @@ static int build_vrma_slbe(PowerPCCPU *cpu, ppc_slb_t *= slb) } =20 error_report("Bad page size encoding in LPCR[VRMASD]; LPCR=3D0x" - TARGET_FMT_lx"\n", lpcr); + TARGET_FMT_lx, lpcr); =20 return -1; } --=20 2.26.2 From nobody Sat Nov 15 14:11:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595407359; cv=none; d=zohomail.com; s=zohoarc; b=DyYQz20tNJMsFZvpk0U2JOfl6qom+csNaDSscOuuXWcqRisDT6QkH8HssOXH4Fu4peYssFgDYoGMiTBwszWkOJKsObvI9eRhwkMD9q9jftpWH5csSzGsePWM1e1xCSqJqWzMOlqP067ojIL9XDgzxdela0i4ZpuI2sNEgdxFHro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595407359; h=Content-Type: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=veS8tDmS+pVLznx/cjKbiuRYwxp6bkibjxraPx62U9w=; b=G/jF2FtmgCoIazI34tkQ0LAQWqv9twQn8yaBV7OYmE8lBK18D6DOUOks6bDPMNp7rxt1Ja3mmvV5MVxaUjgtjvvB47mOgglSH+7BoTkD/ggH0kf81ZJeM7Ygpy07mm4Zuj+faleMPbW5hRbVXU+aymm/sKLAKxK2mnbjkzOT6bg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1595407359724470.7732513636255; Wed, 22 Jul 2020 01:42:39 -0700 (PDT) Received: from localhost ([::1]:46310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyAKk-0005Pd-Bv for importer@patchew.org; Wed, 22 Jul 2020 04:42:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyAJ9-0003lZ-Br for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:40:59 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:49276 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyAJ7-0000OM-Mz for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:40:59 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-136-dm0uZP-WPoSU57VpM9b-Ag-1; Wed, 22 Jul 2020 04:40:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF658102C84A; Wed, 22 Jul 2020 08:40:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E54374F6B; Wed, 22 Jul 2020 08:40:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0B5A7107F758; Wed, 22 Jul 2020 10:40:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595407256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=veS8tDmS+pVLznx/cjKbiuRYwxp6bkibjxraPx62U9w=; b=iatSxT9lDTxZ+OnL8JpM5Kip/deZsCsW/fBxFxIfXenk01x4Ggr616idHDa2XNZq8wz472 +f7lgQlyI/kLrM1iPG4qQIaQSkVoWGt2XlzBQ/upnCqk293AD2hYa25uxAkz6h9tN0ErbD BBdFvWyEkL9hnO5B06xH317qH6sljIQ= X-MC-Unique: dm0uZP-WPoSU57VpM9b-Ag-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/4] error: Remove NULL checks on error_propagate() calls (again) Date: Wed, 22 Jul 2020 10:40:47 +0200 Message-Id: <20200722084048.1726105-4-armbru@redhat.com> In-Reply-To: <20200722084048.1726105-1-armbru@redhat.com> References: <20200722084048.1726105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 21:28:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Jens Freimann , Hailiang Zhang , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Patch created mechanically by rerunning: $ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --use-gitgrep . Cc: Jens Freimann Cc: Hailiang Zhang Cc: Juan Quintela Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- hw/net/virtio-net.c | 8 ++------ migration/colo.c | 4 +--- migration/migration.c | 8 ++------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 4895af1cbe..21b9a315ed 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -809,9 +809,7 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) "sure primary device has parameter" " failover_pair_id=3D\n"); } - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } =20 static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) @@ -865,9 +863,7 @@ static DeviceState *virtio_connect_failover_devices(Vir= tIONet *n, n->primary_device_id =3D g_strdup(prim_dev->id); n->primary_device_opts =3D prim_dev->opts; } else { - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } =20 return prim_dev; diff --git a/migration/colo.c b/migration/colo.c index ea7d1e9d4e..c6848c829b 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -798,9 +798,7 @@ static void colo_incoming_process_checkpoint(MigrationI= ncomingState *mis, =20 colo_send_message(mis->to_src_file, COLO_MESSAGE_VMSTATE_LOADED, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); } =20 static void colo_wait_handle_message(MigrationIncomingState *mis, diff --git a/migration/migration.c b/migration/migration.c index 2ed9923227..6a458b8fe5 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -601,9 +601,7 @@ void migration_fd_process_incoming(QEMUFile *f, Error *= *errp) } =20 if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } migration_incoming_process(); @@ -625,9 +623,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Er= ror **errp) } =20 if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } =20 --=20 2.26.2 From nobody Sat Nov 15 14:11:19 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595407468; cv=none; d=zohomail.com; s=zohoarc; b=f6rfZnQT1FnW39alEQLX6H0fRty9g2Jpc6p/wBWvBTNQ+H62oAy8YOKYk0fAgGJyMMUWTs0cyZVKR0HbjDb9sDkiR67srCznrFOz2t+7noJmq0WRiJ9/WgV83SYjQH0ttL/3MA0yO68cLfHXwUeIjhZYtuN/R2jlmKab2LUJ9Kw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595407468; h=Content-Type: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=cZsRHA+6UlTuB0PRoHEFLy2Ee/c0JGlbkBfkb86ChPY=; b=WyKUkcERrHQbhIHU/wmghpcn86+9h60xgHVi7HX2dpHmfYs7oqmrjcJQbkpDGVd1R3RJV4gWk/fxp7NJZFtHQzDuYA9jJ9vazu76lx/UKT1fCdMU7YGFQ1uK0l5DGBBSbeqVD4RmBxALZs/y67dkAnbBvFOLbNNu+WUNT2DgMi0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1595407468066516.6224419247725; Wed, 22 Jul 2020 01:44:28 -0700 (PDT) Received: from localhost ([::1]:52760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyAMT-00080n-QO for importer@patchew.org; Wed, 22 Jul 2020 04:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyAJC-0003ov-80 for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:41:02 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:27111 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyAJA-0000P9-63 for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:41:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-239-k6OphLYUOrSoZIN3CBiSig-1; Wed, 22 Jul 2020 04:40:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 813E6801E6A for ; Wed, 22 Jul 2020 08:40:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7147E5D9D7; Wed, 22 Jul 2020 08:40:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0ECCF10593DD; Wed, 22 Jul 2020 10:40:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595407259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cZsRHA+6UlTuB0PRoHEFLy2Ee/c0JGlbkBfkb86ChPY=; b=IaPa2SbbnP8/ZmduYnfRzbwljhw0UVjvyGYFBqUsyu+SUOlcH410M0Q1978ThGaFo4J3cO 8li+28N252yTZaqJBZfJOhXrdSCNtKXaQClp7LPL+ZIw9y3QSfuIx1rFA5MNJGNxlILsf9 uOPI+oYW51zcGchC3ZNncqCGRC+zgI4= X-MC-Unique: k6OphLYUOrSoZIN3CBiSig-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 4/4] error: Use error_fatal to simplify obvious fatal errors (again) Date: Wed, 22 Jul 2020 10:40:48 +0200 Message-Id: <20200722084048.1726105-5-armbru@redhat.com> In-Reply-To: <20200722084048.1726105-1-armbru@redhat.com> References: <20200722084048.1726105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 23:34:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Eric Auger , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Patch created mechanically by rerunning: $ spatch --in-place --sp-file scripts/coccinelle/use-error_fatal.cocci \ --macro-file scripts/cocci-macro-file.h --use-gitgrep . Variables now unused dropped manually. Cc: Eric Auger Cc: David Hildenbrand Signed-off-by: Markus Armbruster Reviewed-by: David Hildenbrand --- exec.c | 11 +++-------- hw/s390x/s390-virtio-ccw.c | 6 +----- hw/virtio/vhost.c | 10 +++------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/exec.c b/exec.c index 6f381f98e2..61b46a62f8 100644 --- a/exec.c +++ b/exec.c @@ -627,8 +627,7 @@ static void tcg_register_iommu_notifier(CPUState *cpu, */ MemoryRegion *mr =3D MEMORY_REGION(iommu_mr); TCGIOMMUNotifier *notifier; - Error *err =3D NULL; - int i, ret; + int i; =20 for (i =3D 0; i < cpu->iommu_notifiers->len; i++) { notifier =3D g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier = *, i); @@ -657,12 +656,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 0, HWADDR_MAX, iommu_idx); - ret =3D memory_region_register_iommu_notifier(notifier->mr, ¬if= ier->n, - &err); - if (ret) { - error_report_err(err); - exit(1); - } + memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n, + &error_fatal); } =20 if (!notifier->active) { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 8cc2f25d8a..4fc92559fb 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -170,11 +170,7 @@ static void s390_memory_init(MemoryRegion *ram) * Configure the maximum page size. As no memory devices were created * yet, this is the page size of initial memory only. */ - s390_set_max_pagesize(qemu_maxrampagesize(), &local_err); - if (local_err) { - error_report_err(local_err); - exit(EXIT_FAILURE); - } + s390_set_max_pagesize(qemu_maxrampagesize(), &error_fatal); /* Initialize storage key device */ s390_skeys_init(); /* Initialize storage attributes device */ diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1a1384e7a6..cc8c1f89d5 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -712,9 +712,8 @@ static void vhost_iommu_region_add(MemoryListener *list= ener, iommu_listener); struct vhost_iommu *iommu; Int128 end; - int iommu_idx, ret; + int iommu_idx; IOMMUMemoryRegion *iommu_mr; - Error *err =3D NULL; =20 if (!memory_region_is_iommu(section->mr)) { return; @@ -737,11 +736,8 @@ static void vhost_iommu_region_add(MemoryListener *lis= tener, iommu->iommu_offset =3D section->offset_within_address_space - section->offset_within_region; iommu->hdev =3D dev; - ret =3D memory_region_register_iommu_notifier(section->mr, &iommu->n, = &err); - if (ret) { - error_report_err(err); - exit(1); - } + memory_region_register_iommu_notifier(section->mr, &iommu->n, + &error_fatal); QLIST_INSERT_HEAD(&dev->iommu_list, iommu, iommu_next); /* TODO: can replay help performance here? */ } --=20 2.26.2