Re: [PATCH 2/4] error: Strip trailing '\n' from error string arguments (again)

[David Gibson]

On Wed, Jul 22, 2020 at 10:40:46AM +0200, Markus Armbruster wrote:
> 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>

ppc part
Acked-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  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;
>  }

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature