Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ihf7H-0001dm-St for mharc-qemu-trivial@gnu.org; Wed, 18 Dec 2019 14:36:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40052) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihf7E-0001Zk-R0 for qemu-trivial@nongnu.org; Wed, 18 Dec 2019 14:36:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihf7D-0005Ng-0S for qemu-trivial@nongnu.org; Wed, 18 Dec 2019 14:36:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21442 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihf7B-0005Fq-W2 for qemu-trivial@nongnu.org; Wed, 18 Dec 2019 14:36:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576697769; 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:openpgp:openpgp; bh=GiprSwdHZ/Z6TSNz/6DxrHEnQe0kiuxGby8tvQrTjLc=; b=Lo/eNSgzgKqZWAr0bcla16OcBeKNcLv8HCiRhDV0Qwl/i8v1mrZvNGmc+FgqK7oz5YgKXg +mCMUlYF+H9pmUXGdceGK/PPD1QI5wcPIya5IA+Tt79d8dUoaZryfz7HzDOd+Aek7fx29L UjGCHo/mdMgkmsrA7uYv4H2Rqmx5b1w= 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-320-WxuNooOsNP2TC_FJfZ2PFQ-1; Wed, 18 Dec 2019 14:35:57 -0500 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 5E8C4102CE16; Wed, 18 Dec 2019 19:35:54 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-120.ams2.redhat.com [10.36.116.120]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56DAE5D9E2; Wed, 18 Dec 2019 19:35:50 +0000 (UTC) Subject: Re: [PATCH 3/6] hw/net/imx_fec: Rewrite fall through comments From: Thomas Huth To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org Cc: Peter Maydell , qemu-trivial@nongnu.org, Jason Wang , qemu-arm@nongnu.org, Peter Chubb References: <20191217173425.5082-1-philmd@redhat.com> <20191217173425.5082-4-philmd@redhat.com> <2fc74b64-0a0b-c437-e925-4c16d3907da7@redhat.com> Openpgp: preference=signencrypt Message-ID: <54e5071f-b5c2-3cc7-514c-ecc2b7e2bed4@redhat.com> Date: Wed, 18 Dec 2019 20:35:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <2fc74b64-0a0b-c437-e925-4c16d3907da7@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: WxuNooOsNP2TC_FJfZ2PFQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-trivial@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: Wed, 18 Dec 2019 19:36:14 -0000 On 17/12/2019 18.55, Thomas Huth wrote: > On 17/12/2019 18.34, Philippe Mathieu-Daud=C3=A9 wrote: >> GCC9 is confused by this comment when building with CFLAG >> -Wimplicit-fallthrough=3D2: >> >> hw/net/imx_fec.c: In function =E2=80=98imx_eth_write=E2=80=99: >> hw/net/imx_fec.c:906:12: error: this statement may fall through [-Werr= or=3Dimplicit-fallthrough=3D] >> 906 | if (unlikely(single_tx_ring)) { >> | ^ >> hw/net/imx_fec.c:912:5: note: here >> 912 | case ENET_TDAR: /* FALLTHROUGH */ >> | ^~~~ >> cc1: all warnings being treated as errors >> >> Rewrite the comments in the correct place, using 'fall through' >> which is recognized by GCC and static analyzers. >> >> Signed-off-by: Philippe Mathieu-Daud=C3=A9 >> --- >> Cc: Peter Chubb >> Cc: Peter Maydell >> Cc: Jason Wang >> Cc: qemu-arm@nongnu.org >> --- >> hw/net/imx_fec.c | 8 +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c >> index bd99236864..30cc07753d 100644 >> --- a/hw/net/imx_fec.c >> +++ b/hw/net/imx_fec.c >> @@ -901,15 +901,17 @@ static void imx_eth_write(void *opaque, hwaddr off= set, uint64_t value, >> s->regs[index] =3D 0; >> } >> break; >> - case ENET_TDAR1: /* FALLTHROUGH */ >> - case ENET_TDAR2: /* FALLTHROUGH */ >> + /* fall through */ >=20 > Wrong location. And I think you don't need any comment here at all, GCC > should stay silent without it? >=20 >> + case ENET_TDAR1: >> + case ENET_TDAR2: >> if (unlikely(single_tx_ring)) { >> qemu_log_mask(LOG_GUEST_ERROR, >> "[%s]%s: trying to access TDAR2 or TDAR1\n", >> TYPE_IMX_FEC, __func__); >> return; >> } >> - case ENET_TDAR: /* FALLTHROUGH */ >> + /* fall through */ >=20 > I'd suggest to simply remove it, too. /me needsmorecoffee ... of course this hunk was fine. Good that you kept it in v2. Thomas >> + case ENET_TDAR: >> if (s->regs[ENET_ECR] & ENET_ECR_ETHEREN) { >> s->regs[index] =3D ENET_TDAR_TDAR; >> imx_eth_do_tx(s, index); >> >=20 > Thomas >=20