From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A945C2BA2B for ; Tue, 14 Apr 2020 02:30:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3D6D2072A for ; Tue, 14 Apr 2020 02:30:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="Yo0hHh8Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3D6D2072A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOBLj-0000pR-Th for qemu-devel@archiver.kernel.org; Mon, 13 Apr 2020 22:30:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46262) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOBKj-0008Tt-4C for qemu-devel@nongnu.org; Mon, 13 Apr 2020 22:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOBKg-0002vF-Ru for qemu-devel@nongnu.org; Mon, 13 Apr 2020 22:29:53 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:57775 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOBKW-0002im-IV; Mon, 13 Apr 2020 22:29:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 491Ttx1vDCz9sSy; Tue, 14 Apr 2020 12:26:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1586831321; bh=pVo+VSY8y+Oi5K/T4k7QU7qPngrFzz8AMn/gwoxVnq8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Yo0hHh8ZUkr3lsDsOsgjVf6/zrt900Q9UVaIpDkNdMm4VQvPwq4Djw3WlgI73FKe8 fKFIHbXkq9l0quaMZBEBnauTI96m8z4oYoeftiR6Chrxc+dkJ7u1nq/VmVLNmTOOeq iv70dEvkjrvmdYtS9mlu/0fvZ5flcP3GjpcpRb7o= Date: Tue, 14 Apr 2020 12:08:30 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [PATCH-for-5.1 v3 01/24] various: Remove suspicious '\' character outside of #define in C code Message-ID: <20200414020830.GG48061@umbus.fritz.box> References: <20200412223619.11284-1-f4bug@amsat.org> <20200412223619.11284-2-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8/pVXlBMPtxfSuJG" Content-Disposition: inline In-Reply-To: <20200412223619.11284-2-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 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: Fam Zheng , Peter Maydell , Sagar Karandikar , "Michael S. Tsirkin" , Jeff Cody , Jason Wang , qemu-devel@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Max Reitz , qemu-block@nongnu.org, Markus Armbruster , Joel Stanley , qemu-ppc@nongnu.org, Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Eduardo Habkost , Jean-Christophe Dubois , Xie Changlong , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , =?iso-8859-1?Q?C=E9dric?= Le Goater , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Richard Henderson , Kevin Wolf , qemu-riscv@nongnu.org, Andrew Jeffery , Wen Congyang , Subbaraya Sundeep , Palmer Dabbelt , Bastian Koppelmann , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --8/pVXlBMPtxfSuJG Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 13, 2020 at 12:35:56AM +0200, Philippe Mathieu-Daud=E9 wrote: > Fixes the following coccinelle warnings: >=20 > $ spatch --sp-file --verbose-parsing ... \ > scripts/coccinelle/remove_local_err.cocci > ... > SUSPICIOUS: a \ character appears outside of a #define at ./target/ppc/= translate_init.inc.c:5213 > SUSPICIOUS: a \ character appears outside of a #define at ./target/ppc/= translate_init.inc.c:5261 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:166 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:167 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:169 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:170 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:171 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:172 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:173 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5787 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5789 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5800 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5801 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5802 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5804 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5805 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5806 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:6329 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/sd/sdhci= =2Ec:1133 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/scsi/scs= i-disk.c:3081 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/net/virt= io-net.c:1529 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/riscv/si= five_u.c:468 > SUSPICIOUS: a \ character appears outside of a #define at ./dump/dump.c= :1895 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2209 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2215 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2221 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2222 > SUSPICIOUS: a \ character appears outside of a #define at ./block/repli= cation.c:172 > SUSPICIOUS: a \ character appears outside of a #define at ./block/repli= cation.c:173 >=20 > Reviewed-by: Marc-Andr=E9 Lureau > Signed-off-by: Philippe Mathieu-Daud=E9 ppc parts Acked-by: David Gibson > --- > block/replication.c | 4 ++-- > block/vhdx.c | 8 ++++---- > dump/dump.c | 2 +- > hw/net/virtio-net.c | 2 +- > hw/riscv/sifive_u.c | 2 +- > hw/scsi/scsi-disk.c | 2 +- > hw/sd/sdhci.c | 2 +- > target/i386/cpu.c | 18 +++++++++--------- > target/microblaze/cpu.c | 14 +++++++------- > target/ppc/translate_init.inc.c | 4 ++-- > 10 files changed, 29 insertions(+), 29 deletions(-) >=20 > diff --git a/block/replication.c b/block/replication.c > index da013c2041..971f0fe266 100644 > --- a/block/replication.c > +++ b/block/replication.c > @@ -172,8 +172,8 @@ static void replication_child_perm(BlockDriverState *= bs, BdrvChild *c, > if ((bs->open_flags & (BDRV_O_INACTIVE | BDRV_O_RDWR)) =3D=3D BDRV_O= _RDWR) { > *nperm |=3D BLK_PERM_WRITE; > } > - *nshared =3D BLK_PERM_CONSISTENT_READ \ > - | BLK_PERM_WRITE \ > + *nshared =3D BLK_PERM_CONSISTENT_READ > + | BLK_PERM_WRITE > | BLK_PERM_WRITE_UNCHANGED; > return; > } > diff --git a/block/vhdx.c b/block/vhdx.c > index 33e57cd656..e16fdc2f2d 100644 > --- a/block/vhdx.c > +++ b/block/vhdx.c > @@ -2206,20 +2206,20 @@ static QemuOptsList vhdx_create_opts =3D { > .name =3D VHDX_BLOCK_OPT_BLOCK_SIZE, > .type =3D QEMU_OPT_SIZE, > .def_value_str =3D stringify(0), > - .help =3D "Block Size; min 1MB, max 256MB. " \ > + .help =3D "Block Size; min 1MB, max 256MB. " > "0 means auto-calculate based on image size." > }, > { > .name =3D BLOCK_OPT_SUBFMT, > .type =3D QEMU_OPT_STRING, > - .help =3D "VHDX format type, can be either 'dynamic' or 'fixe= d'. "\ > + .help =3D "VHDX format type, can be either 'dynamic' or 'fixe= d'. " > "Default is 'dynamic'." > }, > { > .name =3D VHDX_BLOCK_OPT_ZERO, > .type =3D QEMU_OPT_BOOL, > - .help =3D "Force use of payload blocks of type 'ZERO'. "\ > - "Non-standard, but default. Do not set to 'off' when= "\ > + .help =3D "Force use of payload blocks of type 'ZERO'. " > + "Non-standard, but default. Do not set to 'off' when= " > "using 'qemu-img convert' with subformat=3Ddynamic." > }, > { NULL } > diff --git a/dump/dump.c b/dump/dump.c > index 22ed1d3b0d..248ea06370 100644 > --- a/dump/dump.c > +++ b/dump/dump.c > @@ -1892,7 +1892,7 @@ static void dump_process(DumpState *s, Error **errp) > result =3D qmp_query_dump(NULL); > /* should never fail */ > assert(result); > - qapi_event_send_dump_completed(result, !!local_err, (local_err ? \ > + qapi_event_send_dump_completed(result, !!local_err, (local_err ? > error_get_pretty(local_err) : NULL)); > qapi_free_DumpQueryResult(result); > =20 > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index a46e3b37a7..eddfa7f923 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -1526,7 +1526,7 @@ static void virtio_net_rsc_extract_unit6(VirtioNetR= scChain *chain, > + sizeof(struct eth_header)); > unit->ip =3D ip6; > unit->ip_plen =3D &(ip6->ip6_ctlun.ip6_un1.ip6_un1_plen); > - unit->tcp =3D (struct tcp_header *)(((uint8_t *)unit->ip)\ > + unit->tcp =3D (struct tcp_header *)(((uint8_t *)unit->ip) > + sizeof(struct ip6_header)); > unit->tcp_hdrlen =3D (htons(unit->tcp->th_offset_flags) & 0xF000) >>= 10; > =20 > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 56351c4faa..998666c91f 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -465,7 +465,7 @@ static void riscv_sifive_u_machine_instance_init(Obje= ct *obj) > object_property_add_bool(obj, "start-in-flash", sifive_u_get_start_i= n_flash, > sifive_u_set_start_in_flash, NULL); > object_property_set_description(obj, "start-in-flash", > - "Set on to tell QEMU's ROM to jump t= o " \ > + "Set on to tell QEMU's ROM to jump t= o " > "flash. Otherwise QEMU will jump to = DRAM", > NULL); > } > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index 1c0cb63a6f..e5bcd0baf8 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -3078,7 +3078,7 @@ static const TypeInfo scsi_cd_info =3D { > =20 > #ifdef __linux__ > static Property scsi_block_properties[] =3D { > - DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), \ > + DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), > DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk), > DEFINE_PROP_BOOL("share-rw", SCSIDiskState, qdev.conf.share_rw, fals= e), > DEFINE_PROP_UINT16("rotation_rate", SCSIDiskState, rotation_rate, 0), > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index de63ffb037..70531ad360 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1130,7 +1130,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) > =20 > /* Limit block size to the maximum buffer size */ > if (extract32(s->blksize, 0, 12) > s->buf_maxsz) { > - qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than= " \ > + qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than= " > "the maximum buffer 0x%x", __func__, s->blksiz= e, > s->buf_maxsz); > =20 > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 90ffc5f3b1..9c256ab159 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -5784,9 +5784,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, > host_cpuid(index, 0, eax, ebx, ecx, edx); > break; > } > - *eax =3D (L1_DTLB_2M_ASSOC << 24) | (L1_DTLB_2M_ENTRIES << 16) |= \ > + *eax =3D (L1_DTLB_2M_ASSOC << 24) | (L1_DTLB_2M_ENTRIES << 16) | > (L1_ITLB_2M_ASSOC << 8) | (L1_ITLB_2M_ENTRIES); > - *ebx =3D (L1_DTLB_4K_ASSOC << 24) | (L1_DTLB_4K_ENTRIES << 16) |= \ > + *ebx =3D (L1_DTLB_4K_ASSOC << 24) | (L1_DTLB_4K_ENTRIES << 16) | > (L1_ITLB_4K_ASSOC << 8) | (L1_ITLB_4K_ENTRIES); > *ecx =3D encode_cache_cpuid80000005(env->cache_info_amd.l1d_cach= e); > *edx =3D encode_cache_cpuid80000005(env->cache_info_amd.l1i_cach= e); > @@ -5797,13 +5797,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t ind= ex, uint32_t count, > host_cpuid(index, 0, eax, ebx, ecx, edx); > break; > } > - *eax =3D (AMD_ENC_ASSOC(L2_DTLB_2M_ASSOC) << 28) | \ > - (L2_DTLB_2M_ENTRIES << 16) | \ > - (AMD_ENC_ASSOC(L2_ITLB_2M_ASSOC) << 12) | \ > + *eax =3D (AMD_ENC_ASSOC(L2_DTLB_2M_ASSOC) << 28) | > + (L2_DTLB_2M_ENTRIES << 16) | > + (AMD_ENC_ASSOC(L2_ITLB_2M_ASSOC) << 12) | > (L2_ITLB_2M_ENTRIES); > - *ebx =3D (AMD_ENC_ASSOC(L2_DTLB_4K_ASSOC) << 28) | \ > - (L2_DTLB_4K_ENTRIES << 16) | \ > - (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | \ > + *ebx =3D (AMD_ENC_ASSOC(L2_DTLB_4K_ASSOC) << 28) | > + (L2_DTLB_4K_ENTRIES << 16) | > + (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | > (L2_ITLB_4K_ENTRIES); > encode_cache_cpuid80000006(env->cache_info_amd.l2_cache, > cpu->enable_l3_cache ? > @@ -6326,7 +6326,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Er= ror **errp) > */ > env->features[w] |=3D > x86_cpu_get_supported_feature_word(w, cpu->migratable) & > - ~env->user_features[w] & \ > + ~env->user_features[w] & > ~feature_word_info[w].no_autoenable_flags; > } > } > diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c > index a2c2f271df..c9cf2364ca 100644 > --- a/target/microblaze/cpu.c > +++ b/target/microblaze/cpu.c > @@ -163,14 +163,14 @@ static void mb_cpu_realizefn(DeviceState *dev, Erro= r **errp) > =20 > qemu_init_vcpu(cs); > =20 > - env->pvr.regs[0] =3D PVR0_USE_EXC_MASK \ > - | PVR0_USE_ICACHE_MASK \ > + env->pvr.regs[0] =3D PVR0_USE_EXC_MASK > + | PVR0_USE_ICACHE_MASK > | PVR0_USE_DCACHE_MASK; > - env->pvr.regs[2] =3D PVR2_D_OPB_MASK \ > - | PVR2_D_LMB_MASK \ > - | PVR2_I_OPB_MASK \ > - | PVR2_I_LMB_MASK \ > - | PVR2_FPU_EXC_MASK \ > + env->pvr.regs[2] =3D PVR2_D_OPB_MASK > + | PVR2_D_LMB_MASK > + | PVR2_I_OPB_MASK > + | PVR2_I_LMB_MASK > + | PVR2_FPU_EXC_MASK > | 0; > =20 > version =3D cpu->cfg.version ? cpu->cfg.version : DEFAULT_CPU_VERSIO= N; > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.= inc.c > index e853164a86..fd763e588e 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -5210,7 +5210,7 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) > PPC_FLOAT_STFIWX | PPC_WAIT | > PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | > PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; > - pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | \ > + pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | > PPC2_FP_CVT_S64; > pcc->msr_mask =3D (1ull << MSR_CM) | > (1ull << MSR_GS) | > @@ -5258,7 +5258,7 @@ POWERPC_FAMILY(e6500)(ObjectClass *oc, void *data) > PPC_FLOAT_STFIWX | PPC_WAIT | > PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | > PPC_64B | PPC_POPCNTB | PPC_POPCNTWD | PPC_ALTIVE= C; > - pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | \ > + pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | > PPC2_FP_CVT_S64 | PPC2_ATOMIC_ISA206; > pcc->msr_mask =3D (1ull << MSR_CM) | > (1ull << MSR_GS) | --=20 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 --8/pVXlBMPtxfSuJG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl6VGx4ACgkQbDjKyiDZ s5L2ghAAnyJgldhUi/2NP/7N9REMq/gw8OjrPLHhPGhQzihy9bNwi8gscg8Owqd4 3NR0oPhBfFWik2AWMDUxi+Wc250kfY4CxOhqjTqi/etVoNp3y2d4oyX3V6GCH2PQ 32q7l0Twp14zVv1sr9LVa9ahffJ07y8kLiOfYDJX8AJ1JlwOUZX6Wcuyuhm/M+qg 0ZG/LPdITRInXHFJHKQoNaGgKcVuuh74bue/WBtRccsM7WyCmEvG34wv6p1Dnoqq PIaAFKlkStYFQ92yYI85uuJFGbM6QbIdLSpbpZ5ukOZL5AKnrr+it24Jlpl3KxoK GqWxdzVU3+/ii8TcjFleRG5MnGRaVKDLkxYZcUoCQJL0ZofwqxyPuOKnVkN86JLw VwTANI9WHIPGZeDSoFICHuEuIuV1lfSYJ3uAuRfMMyjA/39Xh08WJPOOtHjMOODh yJ7H/8jt9abJWe+kA/eCcxASVRFAM5uJU0J1tVCzHPRLj2Eu45dcS/w+VABNkskJ 6jBL5MVYT0s0UR2fd50ERzE6SV/H97GI1wX8XuRsuxoHLE63UQ5Cg74Iqx5wB66c 7lNN7+fTxoGWD2OLQWkCl3+FBgHkksYtyxvPEHARuLfh9FQ2he67ZFwisIqatco1 hAxWsHbXqbci7U6PJ1AItp+bAAVBLgZYSkhmJtYN7r0kRafKjY8= =1Q0S -----END PGP SIGNATURE----- --8/pVXlBMPtxfSuJG-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jOBKx-0000Mk-Qg for mharc-qemu-riscv@gnu.org; Mon, 13 Apr 2020 22:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46336) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOBKt-0000H1-Ux for qemu-riscv@nongnu.org; Mon, 13 Apr 2020 22:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOBKr-0002xX-Sx for qemu-riscv@nongnu.org; Mon, 13 Apr 2020 22:30:03 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:57775 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOBKW-0002im-IV; Mon, 13 Apr 2020 22:29:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 491Ttx1vDCz9sSy; Tue, 14 Apr 2020 12:26:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1586831321; bh=pVo+VSY8y+Oi5K/T4k7QU7qPngrFzz8AMn/gwoxVnq8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Yo0hHh8ZUkr3lsDsOsgjVf6/zrt900Q9UVaIpDkNdMm4VQvPwq4Djw3WlgI73FKe8 fKFIHbXkq9l0quaMZBEBnauTI96m8z4oYoeftiR6Chrxc+dkJ7u1nq/VmVLNmTOOeq iv70dEvkjrvmdYtS9mlu/0fvZ5flcP3GjpcpRb7o= Date: Tue, 14 Apr 2020 12:08:30 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, Joel Stanley , Jean-Christophe Dubois , Subbaraya Sundeep , Max Reitz , Palmer Dabbelt , qemu-ppc@nongnu.org, Sagar Karandikar , Markus Armbruster , Jeff Cody , Peter Maydell , Xie Changlong , Fam Zheng , Eduardo Habkost , Alistair Francis , qemu-arm@nongnu.org, Wen Congyang , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Bastian Koppelmann , "Edgar E. Iglesias" , Kevin Wolf , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Jason Wang , Peter Chubb , Beniamino Galvani , Alistair Francis , qemu-riscv@nongnu.org, =?iso-8859-1?Q?C=E9dric?= Le Goater , qemu-block@nongnu.org, Paolo Bonzini , Andrew Jeffery , "Michael S. Tsirkin" , Richard Henderson Subject: Re: [PATCH-for-5.1 v3 01/24] various: Remove suspicious '\' character outside of #define in C code Message-ID: <20200414020830.GG48061@umbus.fritz.box> References: <20200412223619.11284-1-f4bug@amsat.org> <20200412223619.11284-2-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8/pVXlBMPtxfSuJG" Content-Disposition: inline In-Reply-To: <20200412223619.11284-2-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2020 02:30:06 -0000 --8/pVXlBMPtxfSuJG Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 13, 2020 at 12:35:56AM +0200, Philippe Mathieu-Daud=E9 wrote: > Fixes the following coccinelle warnings: >=20 > $ spatch --sp-file --verbose-parsing ... \ > scripts/coccinelle/remove_local_err.cocci > ... > SUSPICIOUS: a \ character appears outside of a #define at ./target/ppc/= translate_init.inc.c:5213 > SUSPICIOUS: a \ character appears outside of a #define at ./target/ppc/= translate_init.inc.c:5261 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:166 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:167 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:169 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:170 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:171 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:172 > SUSPICIOUS: a \ character appears outside of a #define at ./target/micr= oblaze/cpu.c:173 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5787 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5789 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5800 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5801 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5802 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5804 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5805 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:5806 > SUSPICIOUS: a \ character appears outside of a #define at ./target/i386= /cpu.c:6329 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/sd/sdhci= =2Ec:1133 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/scsi/scs= i-disk.c:3081 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/net/virt= io-net.c:1529 > SUSPICIOUS: a \ character appears outside of a #define at ./hw/riscv/si= five_u.c:468 > SUSPICIOUS: a \ character appears outside of a #define at ./dump/dump.c= :1895 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2209 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2215 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2221 > SUSPICIOUS: a \ character appears outside of a #define at ./block/vhdx.= c:2222 > SUSPICIOUS: a \ character appears outside of a #define at ./block/repli= cation.c:172 > SUSPICIOUS: a \ character appears outside of a #define at ./block/repli= cation.c:173 >=20 > Reviewed-by: Marc-Andr=E9 Lureau > Signed-off-by: Philippe Mathieu-Daud=E9 ppc parts Acked-by: David Gibson > --- > block/replication.c | 4 ++-- > block/vhdx.c | 8 ++++---- > dump/dump.c | 2 +- > hw/net/virtio-net.c | 2 +- > hw/riscv/sifive_u.c | 2 +- > hw/scsi/scsi-disk.c | 2 +- > hw/sd/sdhci.c | 2 +- > target/i386/cpu.c | 18 +++++++++--------- > target/microblaze/cpu.c | 14 +++++++------- > target/ppc/translate_init.inc.c | 4 ++-- > 10 files changed, 29 insertions(+), 29 deletions(-) >=20 > diff --git a/block/replication.c b/block/replication.c > index da013c2041..971f0fe266 100644 > --- a/block/replication.c > +++ b/block/replication.c > @@ -172,8 +172,8 @@ static void replication_child_perm(BlockDriverState *= bs, BdrvChild *c, > if ((bs->open_flags & (BDRV_O_INACTIVE | BDRV_O_RDWR)) =3D=3D BDRV_O= _RDWR) { > *nperm |=3D BLK_PERM_WRITE; > } > - *nshared =3D BLK_PERM_CONSISTENT_READ \ > - | BLK_PERM_WRITE \ > + *nshared =3D BLK_PERM_CONSISTENT_READ > + | BLK_PERM_WRITE > | BLK_PERM_WRITE_UNCHANGED; > return; > } > diff --git a/block/vhdx.c b/block/vhdx.c > index 33e57cd656..e16fdc2f2d 100644 > --- a/block/vhdx.c > +++ b/block/vhdx.c > @@ -2206,20 +2206,20 @@ static QemuOptsList vhdx_create_opts =3D { > .name =3D VHDX_BLOCK_OPT_BLOCK_SIZE, > .type =3D QEMU_OPT_SIZE, > .def_value_str =3D stringify(0), > - .help =3D "Block Size; min 1MB, max 256MB. " \ > + .help =3D "Block Size; min 1MB, max 256MB. " > "0 means auto-calculate based on image size." > }, > { > .name =3D BLOCK_OPT_SUBFMT, > .type =3D QEMU_OPT_STRING, > - .help =3D "VHDX format type, can be either 'dynamic' or 'fixe= d'. "\ > + .help =3D "VHDX format type, can be either 'dynamic' or 'fixe= d'. " > "Default is 'dynamic'." > }, > { > .name =3D VHDX_BLOCK_OPT_ZERO, > .type =3D QEMU_OPT_BOOL, > - .help =3D "Force use of payload blocks of type 'ZERO'. "\ > - "Non-standard, but default. Do not set to 'off' when= "\ > + .help =3D "Force use of payload blocks of type 'ZERO'. " > + "Non-standard, but default. Do not set to 'off' when= " > "using 'qemu-img convert' with subformat=3Ddynamic." > }, > { NULL } > diff --git a/dump/dump.c b/dump/dump.c > index 22ed1d3b0d..248ea06370 100644 > --- a/dump/dump.c > +++ b/dump/dump.c > @@ -1892,7 +1892,7 @@ static void dump_process(DumpState *s, Error **errp) > result =3D qmp_query_dump(NULL); > /* should never fail */ > assert(result); > - qapi_event_send_dump_completed(result, !!local_err, (local_err ? \ > + qapi_event_send_dump_completed(result, !!local_err, (local_err ? > error_get_pretty(local_err) : NULL)); > qapi_free_DumpQueryResult(result); > =20 > diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c > index a46e3b37a7..eddfa7f923 100644 > --- a/hw/net/virtio-net.c > +++ b/hw/net/virtio-net.c > @@ -1526,7 +1526,7 @@ static void virtio_net_rsc_extract_unit6(VirtioNetR= scChain *chain, > + sizeof(struct eth_header)); > unit->ip =3D ip6; > unit->ip_plen =3D &(ip6->ip6_ctlun.ip6_un1.ip6_un1_plen); > - unit->tcp =3D (struct tcp_header *)(((uint8_t *)unit->ip)\ > + unit->tcp =3D (struct tcp_header *)(((uint8_t *)unit->ip) > + sizeof(struct ip6_header)); > unit->tcp_hdrlen =3D (htons(unit->tcp->th_offset_flags) & 0xF000) >>= 10; > =20 > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 56351c4faa..998666c91f 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -465,7 +465,7 @@ static void riscv_sifive_u_machine_instance_init(Obje= ct *obj) > object_property_add_bool(obj, "start-in-flash", sifive_u_get_start_i= n_flash, > sifive_u_set_start_in_flash, NULL); > object_property_set_description(obj, "start-in-flash", > - "Set on to tell QEMU's ROM to jump t= o " \ > + "Set on to tell QEMU's ROM to jump t= o " > "flash. Otherwise QEMU will jump to = DRAM", > NULL); > } > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index 1c0cb63a6f..e5bcd0baf8 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -3078,7 +3078,7 @@ static const TypeInfo scsi_cd_info =3D { > =20 > #ifdef __linux__ > static Property scsi_block_properties[] =3D { > - DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), \ > + DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf), > DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk), > DEFINE_PROP_BOOL("share-rw", SCSIDiskState, qdev.conf.share_rw, fals= e), > DEFINE_PROP_UINT16("rotation_rate", SCSIDiskState, rotation_rate, 0), > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index de63ffb037..70531ad360 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1130,7 +1130,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) > =20 > /* Limit block size to the maximum buffer size */ > if (extract32(s->blksize, 0, 12) > s->buf_maxsz) { > - qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than= " \ > + qemu_log_mask(LOG_GUEST_ERROR, "%s: Size 0x%x is larger than= " > "the maximum buffer 0x%x", __func__, s->blksiz= e, > s->buf_maxsz); > =20 > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 90ffc5f3b1..9c256ab159 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -5784,9 +5784,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, > host_cpuid(index, 0, eax, ebx, ecx, edx); > break; > } > - *eax =3D (L1_DTLB_2M_ASSOC << 24) | (L1_DTLB_2M_ENTRIES << 16) |= \ > + *eax =3D (L1_DTLB_2M_ASSOC << 24) | (L1_DTLB_2M_ENTRIES << 16) | > (L1_ITLB_2M_ASSOC << 8) | (L1_ITLB_2M_ENTRIES); > - *ebx =3D (L1_DTLB_4K_ASSOC << 24) | (L1_DTLB_4K_ENTRIES << 16) |= \ > + *ebx =3D (L1_DTLB_4K_ASSOC << 24) | (L1_DTLB_4K_ENTRIES << 16) | > (L1_ITLB_4K_ASSOC << 8) | (L1_ITLB_4K_ENTRIES); > *ecx =3D encode_cache_cpuid80000005(env->cache_info_amd.l1d_cach= e); > *edx =3D encode_cache_cpuid80000005(env->cache_info_amd.l1i_cach= e); > @@ -5797,13 +5797,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t ind= ex, uint32_t count, > host_cpuid(index, 0, eax, ebx, ecx, edx); > break; > } > - *eax =3D (AMD_ENC_ASSOC(L2_DTLB_2M_ASSOC) << 28) | \ > - (L2_DTLB_2M_ENTRIES << 16) | \ > - (AMD_ENC_ASSOC(L2_ITLB_2M_ASSOC) << 12) | \ > + *eax =3D (AMD_ENC_ASSOC(L2_DTLB_2M_ASSOC) << 28) | > + (L2_DTLB_2M_ENTRIES << 16) | > + (AMD_ENC_ASSOC(L2_ITLB_2M_ASSOC) << 12) | > (L2_ITLB_2M_ENTRIES); > - *ebx =3D (AMD_ENC_ASSOC(L2_DTLB_4K_ASSOC) << 28) | \ > - (L2_DTLB_4K_ENTRIES << 16) | \ > - (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | \ > + *ebx =3D (AMD_ENC_ASSOC(L2_DTLB_4K_ASSOC) << 28) | > + (L2_DTLB_4K_ENTRIES << 16) | > + (AMD_ENC_ASSOC(L2_ITLB_4K_ASSOC) << 12) | > (L2_ITLB_4K_ENTRIES); > encode_cache_cpuid80000006(env->cache_info_amd.l2_cache, > cpu->enable_l3_cache ? > @@ -6326,7 +6326,7 @@ static void x86_cpu_expand_features(X86CPU *cpu, Er= ror **errp) > */ > env->features[w] |=3D > x86_cpu_get_supported_feature_word(w, cpu->migratable) & > - ~env->user_features[w] & \ > + ~env->user_features[w] & > ~feature_word_info[w].no_autoenable_flags; > } > } > diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c > index a2c2f271df..c9cf2364ca 100644 > --- a/target/microblaze/cpu.c > +++ b/target/microblaze/cpu.c > @@ -163,14 +163,14 @@ static void mb_cpu_realizefn(DeviceState *dev, Erro= r **errp) > =20 > qemu_init_vcpu(cs); > =20 > - env->pvr.regs[0] =3D PVR0_USE_EXC_MASK \ > - | PVR0_USE_ICACHE_MASK \ > + env->pvr.regs[0] =3D PVR0_USE_EXC_MASK > + | PVR0_USE_ICACHE_MASK > | PVR0_USE_DCACHE_MASK; > - env->pvr.regs[2] =3D PVR2_D_OPB_MASK \ > - | PVR2_D_LMB_MASK \ > - | PVR2_I_OPB_MASK \ > - | PVR2_I_LMB_MASK \ > - | PVR2_FPU_EXC_MASK \ > + env->pvr.regs[2] =3D PVR2_D_OPB_MASK > + | PVR2_D_LMB_MASK > + | PVR2_I_OPB_MASK > + | PVR2_I_LMB_MASK > + | PVR2_FPU_EXC_MASK > | 0; > =20 > version =3D cpu->cfg.version ? cpu->cfg.version : DEFAULT_CPU_VERSIO= N; > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.= inc.c > index e853164a86..fd763e588e 100644 > --- a/target/ppc/translate_init.inc.c > +++ b/target/ppc/translate_init.inc.c > @@ -5210,7 +5210,7 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) > PPC_FLOAT_STFIWX | PPC_WAIT | > PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | > PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; > - pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | \ > + pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | > PPC2_FP_CVT_S64; > pcc->msr_mask =3D (1ull << MSR_CM) | > (1ull << MSR_GS) | > @@ -5258,7 +5258,7 @@ POWERPC_FAMILY(e6500)(ObjectClass *oc, void *data) > PPC_FLOAT_STFIWX | PPC_WAIT | > PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | > PPC_64B | PPC_POPCNTB | PPC_POPCNTWD | PPC_ALTIVE= C; > - pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | \ > + pcc->insns_flags2 =3D PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206= | > PPC2_FP_CVT_S64 | PPC2_ATOMIC_ISA206; > pcc->msr_mask =3D (1ull << MSR_CM) | > (1ull << MSR_GS) | --=20 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 --8/pVXlBMPtxfSuJG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl6VGx4ACgkQbDjKyiDZ s5L2ghAAnyJgldhUi/2NP/7N9REMq/gw8OjrPLHhPGhQzihy9bNwi8gscg8Owqd4 3NR0oPhBfFWik2AWMDUxi+Wc250kfY4CxOhqjTqi/etVoNp3y2d4oyX3V6GCH2PQ 32q7l0Twp14zVv1sr9LVa9ahffJ07y8kLiOfYDJX8AJ1JlwOUZX6Wcuyuhm/M+qg 0ZG/LPdITRInXHFJHKQoNaGgKcVuuh74bue/WBtRccsM7WyCmEvG34wv6p1Dnoqq PIaAFKlkStYFQ92yYI85uuJFGbM6QbIdLSpbpZ5ukOZL5AKnrr+it24Jlpl3KxoK GqWxdzVU3+/ii8TcjFleRG5MnGRaVKDLkxYZcUoCQJL0ZofwqxyPuOKnVkN86JLw VwTANI9WHIPGZeDSoFICHuEuIuV1lfSYJ3uAuRfMMyjA/39Xh08WJPOOtHjMOODh yJ7H/8jt9abJWe+kA/eCcxASVRFAM5uJU0J1tVCzHPRLj2Eu45dcS/w+VABNkskJ 6jBL5MVYT0s0UR2fd50ERzE6SV/H97GI1wX8XuRsuxoHLE63UQ5Cg74Iqx5wB66c 7lNN7+fTxoGWD2OLQWkCl3+FBgHkksYtyxvPEHARuLfh9FQ2he67ZFwisIqatco1 hAxWsHbXqbci7U6PJ1AItp+bAAVBLgZYSkhmJtYN7r0kRafKjY8= =1Q0S -----END PGP SIGNATURE----- --8/pVXlBMPtxfSuJG--