From nobody Sun Feb 8 14:44:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595598479; cv=none; d=zohomail.com; s=zohoarc; b=E1XuBjBQPyNyEG+8f/YlMoNwGTlX5V+xCXfRkSeAYKGjbMD4qr4sD77oLPQ89dvV68r4ORPyrxCebXyuKG0VeRGh4W2HQivUQE8HweruVpsaiU/aKM2QYqeadEGYM+6hkxqVFWvKgcAzmVvSJ3QmFT6IRjzrg55hJpBtdVcPqaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595598479; 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=qNIKTQj4D6Q6eHY0NCKLobup86zWLaw9aLCiYkrrDgI=; b=m4DPGiAYCwz65DAmVyM+GhNWfMCM/LwmnVwiiDMIzXoMqBZRteyi+q1K2Ql6O6k12hYilGrWOf/mdkEX0EvOeMmfkc1RhJK6h/jmppw6zFGLn/UQae7lOmD6HIU2AcB4IBxXKsCMFbj2t+oguAdHD3zCP3DLawzZKAvRDrHk+8Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1595598479724925.296875624093; Fri, 24 Jul 2020 06:47:59 -0700 (PDT) Received: from localhost ([::1]:57714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyy3K-0004zH-6s for importer@patchew.org; Fri, 24 Jul 2020 09:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyy2a-00042z-2K for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:12 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:25000 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 1jyy2Y-0004CW-FK for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:11 -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-252-QWRbpA7oPIuNWJRExO8BOA-1; Fri, 24 Jul 2020 09:47:07 -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 58AB7800468; Fri, 24 Jul 2020 13:47:06 +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 298DB2DE72; Fri, 24 Jul 2020 13:47:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A4FF411385EB; Fri, 24 Jul 2020 15:47:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595598429; 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=qNIKTQj4D6Q6eHY0NCKLobup86zWLaw9aLCiYkrrDgI=; b=AdvoAbwWATDgZHLK7clsw8Bw/3YE6Oh03JOeZbxfW86zatN0542IY/8BzKjs6WtAD7jauI xJWu/SdNqEKMqS1UngxSBRWGM9DIma5XqWiUFZsuAJtpMa0VnT4EuXqzvSTzBHJJoiaCtL TO66WeGZnaaoL/Mblx+eqN/f8EsKHL4= X-MC-Unique: QWRbpA7oPIuNWJRExO8BOA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/4] coccinelle/err-bad-newline: Fix for Python 3, and add patterns Date: Fri, 24 Jul 2020 15:47:01 +0200 Message-Id: <20200724134704.2248335-2-armbru@redhat.com> In-Reply-To: <20200724134704.2248335-1-armbru@redhat.com> References: <20200724134704.2248335-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=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/24 06:44:00 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20200722084048.1726105-2-armbru@redhat.com> 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 Sun Feb 8 14:44:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595598615; cv=none; d=zohomail.com; s=zohoarc; b=iHRyaZ681AeErbqidTMkP7EqIjY7jtMb5dLpHsTCWtM78mi32XEzgwnpuNtmsp2ORGJHy2ywGv13X5ue19EERW0wdxvMQaCO+vZoQND663hCVcuKWlhsEccmVCjInXPqte9if+0LaodVJckA3nfBFb97DN1khfYhRKrgQHaivI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595598615; 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=J/0IocmKsmS1D12je30pvQt+ZUklNprxk52cN3LSkCs=; b=czTAdDQpeVTwyUMpAgzwmiiHhPhAhA2miFemdVKjRK3SyA5acswVvSk7IxkkKyiX3oZMAnrOnrVjMmfVwffaLnmopFJB23iJPsPJLI3WwlVm24uMSpsA4ffqUK25RcJkCvmkn0y+WMBNIAZluQYVWOahhUyxEf4mo0F4necr6HQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1595598615799152.6520970237143; Fri, 24 Jul 2020 06:50:15 -0700 (PDT) Received: from localhost ([::1]:37508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyy5W-0008FW-K8 for importer@patchew.org; Fri, 24 Jul 2020 09:50:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyy2d-000471-7x for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58501 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 1jyy2b-0004DJ-Km for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:14 -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-404-OJzyfBZDPMCuLlbnbQzu4A-1; Fri, 24 Jul 2020 09:47:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5633E8017FB; Fri, 24 Jul 2020 13:47:09 +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 63C6810013D9; Fri, 24 Jul 2020 13:47:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A895411385F1; Fri, 24 Jul 2020 15:47:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595598432; 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=J/0IocmKsmS1D12je30pvQt+ZUklNprxk52cN3LSkCs=; b=fSOTamo8uuK7IyZ+2Q/Z4peY2j3dqc3LdBI5iy4n6W07wrIiPwM8UFU2a4sTRLPlRIQyvP ihmkZk2vE6GjDl/qxa3p0w/oXSYxYjy8ZjMAikYwKiKKwq/XJqY7RIavU09oJD8HKFLj2B UwnJ025AgVd2NlpCaw83xsn9QbxclEE= X-MC-Unique: OJzyfBZDPMCuLlbnbQzu4A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/4] error: Strip trailing '\n' from error string arguments (again) Date: Fri, 24 Jul 2020 15:47:02 +0200 Message-Id: <20200724134704.2248335-3-armbru@redhat.com> In-Reply-To: <20200724134704.2248335-1-armbru@redhat.com> References: <20200724134704.2248335-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/24 08:23:04 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Tracked down with scripts/coccinelle/err-bad-newline.cocci. Cc: Peter Xu Cc: David Gibson Signed-off-by: Markus Armbruster Message-Id: <20200722084048.1726105-3-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Peter Xu --- 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 0c286635cf..5284bb68b6 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 Sun Feb 8 14:44:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595598556; cv=none; d=zohomail.com; s=zohoarc; b=gAwJrBQfgpv+pXrOe56O5HPuVtnJpf8z7Lhefn1k9SeWw8Gep2SumVp1+veRich7+ydik/n0JQ3Om3Ijb2JiSTWFtRasVOCATpauHT3e7Q/DGlruIsxCAcQ8TAO22ag0xS6ziFqYwFb1u9J0cFVkvk4Pg7P6ZhMziBdhRa8fG+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595598556; 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=KuQ3Syxmt1q0sDwrgkJpV7MEwghxQJ2Rnuz9eaWXelY=; b=lS9oO+VmpdDHOq2DyLrRJbShWqMqqBgYpZx2EauhZ8/XRXlvFah7WmI3kABTzDqsOox2mikN8G4a9lVnrJN+8KnneU7Gv/SdSU1j+RJhCLDbDYFCfFCj+Yx81b7D1X6b6t5o3G0PZA+VDU3sSXo3SyWGyhLCpZlyHE2GVYnTB5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1595598556027818.0032844170604; Fri, 24 Jul 2020 06:49:16 -0700 (PDT) Received: from localhost ([::1]:33760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyy4Y-0006j1-TK for importer@patchew.org; Fri, 24 Jul 2020 09:49:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyy2b-00043P-BP for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:22730 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 1jyy2Z-0004Ca-1u for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:13 -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-343-ZG_SO5TeMG-OOZ7BQwFqRQ-1; Fri, 24 Jul 2020 09:47:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EA47193F567; Fri, 24 Jul 2020 13:47:06 +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 3929610013C4; Fri, 24 Jul 2020 13:47:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AC1D211385F9; Fri, 24 Jul 2020 15:47:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595598430; 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=KuQ3Syxmt1q0sDwrgkJpV7MEwghxQJ2Rnuz9eaWXelY=; b=Bi40qvxqNgkm2bXdGwsU+hG/A9rm1Fe3LbHzyVteitd9thJ/Tkyy8P+H3Wn8oxvzaRgJBw 9QV/hl4mCrgjLdiboy6si2AN6o/vfPlj0ZjlpYy2vP0fhRAdvhqjUY8/RjKtm5plvmt7Eu AsuRFb+G64vSnNSEb0sZYdOByRmXUtU= X-MC-Unique: ZG_SO5TeMG-OOZ7BQwFqRQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/4] sd/milkymist-memcard: Fix format string Date: Fri, 24 Jul 2020 15:47:03 +0200 Message-Id: <20200724134704.2248335-4-armbru@redhat.com> In-Reply-To: <20200724134704.2248335-1-armbru@redhat.com> References: <20200724134704.2248335-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/24 00:00:27 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.maydell@linaro.org, Li Qiang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Weil Fixes: b98e8d1230ff7023bb34ddeb7194424dfcbaf789 Signed-off-by: Stefan Weil Message-Id: <20200722204054.1400555-1-sw@weilnetz.de> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Reviewed-by: Li Qiang [Commit message tweaked] Signed-off-by: Markus Armbruster --- hw/sd/milkymist-memcard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index afdb8aa0c0..11f61294fc 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -281,7 +281,7 @@ static void milkymist_memcard_realize(DeviceState *dev,= Error **errp) carddev =3D qdev_new(TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk); if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) { - error_propagate_prepend(errp, err, "failed to init SD card: %s"); + error_propagate_prepend(errp, err, "failed to init SD card"); return; } s->enabled =3D blk && blk_is_inserted(blk); --=20 2.26.2 From nobody Sun Feb 8 14:44:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595598479; cv=none; d=zohomail.com; s=zohoarc; b=iCcxLX7476u6yKSzkQcHjBK6qcMax6FN2Ng393M//DpuKMopeWXsGsojsCz3U4R5JJQzev3Y4A2kxQ8Ccy7hmInbKMYeIqHc6U2NQF9uBw/c1estkzMTLXEkEAkgko/YWTbMmyP9e1xSIE7N2ozGeylo9I/4QwgMCAz39OS8GCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595598479; 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=VvFsC7Lqmvx3of1PoGeArHby5M5skyMWuK3318nba+A=; b=eTdUegXkpYZbTutI8wt6RucybCdDCfPeAjTXs8eSMs044N59XKDRQdvsMA1VRTvCozsgJm5vEG5MJzWzLlIEvIPQ96b2ZhmTfxmkGTwSMDGL300pd5JFf3OUFs8km0nYqPodJ61IUB9ByYfMAYbmXniuoeK+2CZ4WNnjvvHS6pY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1595598479733363.297336109197; Fri, 24 Jul 2020 06:47:59 -0700 (PDT) Received: from localhost ([::1]:57708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyy3K-0004z9-0j for importer@patchew.org; Fri, 24 Jul 2020 09:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyy2a-000436-AK for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:12 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34539 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 1jyy2Y-0004CY-O7 for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:12 -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-286-4oQbOpbIMnqEijZVec0nlA-1; Fri, 24 Jul 2020 09:47:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A09F0107B7F0; Fri, 24 Jul 2020 13:47:06 +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 38479712C1; Fri, 24 Jul 2020 13:47:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AFAD611385FA; Fri, 24 Jul 2020 15:47:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595598429; 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=VvFsC7Lqmvx3of1PoGeArHby5M5skyMWuK3318nba+A=; b=Q3412s6DwzuChrspLcmzEmj5Of1LAZ7M27E37ZX1uEnQh3sXQZjz9BM7wljYIjDaLT4wTz JRQa4DQmChMUF3CpW6xgezdr21WaDe9k1roYwkodhQASMOWuchVgSPcJ+Pv188fTUUjcNG s3suxI06p4rGqYs7R0YRrp9RxwCdpsE= X-MC-Unique: 4oQbOpbIMnqEijZVec0nlA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/4] qapi/error: Check format string argument in error_*prepend() Date: Fri, 24 Jul 2020 15:47:04 +0200 Message-Id: <20200724134704.2248335-5-armbru@redhat.com> In-Reply-To: <20200724134704.2248335-1-armbru@redhat.com> References: <20200724134704.2248335-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/24 06:44:00 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 error_propagate_prepend() "behaves like error_prepend()", and error_prepend() uses "formatting @fmt, ... like printf()". error_prepend() checks its format string argument, but error_propagate_prepend() does not. Fix by addint the format attribute to error_propagate_prepend() and error_vprepend(). This would have caught the bug fixed in the previous commit. Missed in commit 4b5766488f "error: Fix use of error_prepend() with &error_fatal, &error_abort". Inspired-by: Stefan Weil Suggested-by: Eric Blake Reviewed-by: Stefan Weil Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200723171205.14949-1-philmd@redhat.com> Reviewed-by: Markus Armbruster [Commit message tweaked] Signed-off-by: Markus Armbruster --- include/qapi/error.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index 7932594dce..eaa05c4837 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -382,13 +382,15 @@ void error_propagate(Error **dst_errp, Error *local_e= rr); * Please use ERRP_GUARD() and error_prepend() instead when possible. */ void error_propagate_prepend(Error **dst_errp, Error *local_err, - const char *fmt, ...); + const char *fmt, ...) + GCC_FMT_ATTR(3, 4); =20 /* * Prepend some text to @errp's human-readable error message. * The text is made by formatting @fmt, @ap like vprintf(). */ -void error_vprepend(Error *const *errp, const char *fmt, va_list ap); +void error_vprepend(Error *const *errp, const char *fmt, va_list ap) + GCC_FMT_ATTR(2, 0); =20 /* * Prepend some text to @errp's human-readable error message. --=20 2.26.2