From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 2/4] error: Strip trailing '\n' from error string arguments (again)
Date: Wed, 22 Jul 2020 10:40:46 +0200 [thread overview]
Message-ID: <20200722084048.1726105-3-armbru@redhat.com> (raw)
In-Reply-To: <20200722084048.1726105-1-armbru@redhat.com>
Tracked down with scripts/coccinelle/err-bad-newline.cocci.
Cc: Peter Xu <peterx@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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=0x%"PRIx64
- ", lo=0x%"PRIx64" (reserved bits unzero)\n",
+ ", lo=0x%"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 = VTD_INV_DESC_IOTLB_AM(inv_desc->hi);
if (am > VTD_MAMV) {
error_report_once("%s: invalid iotlb inv desc: hi=0x%"PRIx64
- ", lo=0x%"PRIx64" (am=%u > VTD_MAMV=%u)\n",
+ ", lo=0x%"PRIx64" (am=%u > VTD_MAMV=%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)
default:
error_report_once("%s: invalid iotlb inv desc: hi=0x%"PRIx64
- ", lo=0x%"PRIx64" (type mismatch: 0x%llx)\n",
+ ", lo=0x%"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)
}
error_report("Bad page size encoding in LPCR[VRMASD]; LPCR=0x"
- TARGET_FMT_lx"\n", lpcr);
+ TARGET_FMT_lx, lpcr);
return -1;
}
--
2.26.2
next prev parent reply other threads:[~2020-07-22 8:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 8:40 [PATCH 0/4] error: Mechanical fixes & cleanups Markus Armbruster
2020-07-22 8:40 ` [PATCH 1/4] coccinelle/err-bad-newline: Fix for Python 3, and add patterns Markus Armbruster
2020-07-22 13:28 ` Eric Blake
2020-07-22 8:40 ` Markus Armbruster [this message]
2020-07-22 10:04 ` [PATCH 2/4] error: Strip trailing '\n' from error string arguments (again) Philippe Mathieu-Daudé
2020-07-22 10:33 ` David Gibson
2020-07-22 12:46 ` Peter Xu
2020-07-22 8:40 ` [PATCH 3/4] error: Remove NULL checks on error_propagate() calls (again) Markus Armbruster
2020-07-22 13:31 ` Eric Blake
2020-07-23 9:14 ` Markus Armbruster
2020-07-23 13:38 ` Markus Armbruster
2020-07-23 13:42 ` Eric Blake
2020-07-22 8:40 ` [PATCH 4/4] error: Use error_fatal to simplify obvious fatal errors (again) Markus Armbruster
2020-07-22 8:42 ` David Hildenbrand
2020-07-24 13:45 ` [PATCH 0/4] error: Mechanical fixes & cleanups Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200722084048.1726105-3-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).