| Message ID | 20190719131425.10835-8-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Trivial switch 'fall through' comment fixes for GCC9 | expand |
On Fri, Jul 19, 2019 at 03:14:25PM +0200, Philippe Mathieu-Daudé wrote: > GCC9 is confused by this comment when building with CFLAG > -Wimplicit-fallthrough=2: > > CC ppc64-softmmu/hw/ppc/spapr_rtc.o > hw/ppc/spapr_events.c: In function ‘rtas_event_log_to_source’: > hw/ppc/spapr_events.c:312:12: error: this statement may fall through [-Werror=implicit-fallthrough=] > 312 | if (spapr_ovec_test(spapr->ov5_cas, OV5_HP_EVT)) { > | ^ > hw/ppc/spapr_events.c:317:5: note: here > 317 | case RTAS_LOG_TYPE_EPOW: > | ^~~~ > cc1: all warnings being treated as errors > > Rewrite the comment using 'fall through' which is recognized by > GCC and static analyzers. > > Reported-by: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr_events.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c > index ae0f093f59..0a98894ad6 100644 > --- a/hw/ppc/spapr_events.c > +++ b/hw/ppc/spapr_events.c > @@ -313,7 +313,7 @@ rtas_event_log_to_source(SpaprMachineState *spapr, int log_type) > g_assert(source->enabled); > break; > } > - /* fall back to epow for legacy hotplug interrupt source */ > + /* fall through back to epow for legacy hotplug interrupt source */ > case RTAS_LOG_TYPE_EPOW: > source = spapr_event_sources_get_source(spapr->event_sources, > EVENT_CLASS_EPOW);
Le 19/07/2019 à 15:14, Philippe Mathieu-Daudé a écrit : > GCC9 is confused by this comment when building with CFLAG > -Wimplicit-fallthrough=2: > > CC ppc64-softmmu/hw/ppc/spapr_rtc.o > hw/ppc/spapr_events.c: In function ‘rtas_event_log_to_source’: > hw/ppc/spapr_events.c:312:12: error: this statement may fall through [-Werror=implicit-fallthrough=] > 312 | if (spapr_ovec_test(spapr->ov5_cas, OV5_HP_EVT)) { > | ^ > hw/ppc/spapr_events.c:317:5: note: here > 317 | case RTAS_LOG_TYPE_EPOW: > | ^~~~ > cc1: all warnings being treated as errors > > Rewrite the comment using 'fall through' which is recognized by > GCC and static analyzers. > > Reported-by: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/ppc/spapr_events.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c > index ae0f093f59..0a98894ad6 100644 > --- a/hw/ppc/spapr_events.c > +++ b/hw/ppc/spapr_events.c > @@ -313,7 +313,7 @@ rtas_event_log_to_source(SpaprMachineState *spapr, int log_type) > g_assert(source->enabled); > break; > } > - /* fall back to epow for legacy hotplug interrupt source */ > + /* fall through back to epow for legacy hotplug interrupt source */ > case RTAS_LOG_TYPE_EPOW: > source = spapr_event_sources_get_source(spapr->event_sources, > EVENT_CLASS_EPOW); > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index ae0f093f59..0a98894ad6 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -313,7 +313,7 @@ rtas_event_log_to_source(SpaprMachineState *spapr, int log_type) g_assert(source->enabled); break; } - /* fall back to epow for legacy hotplug interrupt source */ + /* fall through back to epow for legacy hotplug interrupt source */ case RTAS_LOG_TYPE_EPOW: source = spapr_event_sources_get_source(spapr->event_sources, EVENT_CLASS_EPOW);
GCC9 is confused by this comment when building with CFLAG -Wimplicit-fallthrough=2: CC ppc64-softmmu/hw/ppc/spapr_rtc.o hw/ppc/spapr_events.c: In function ‘rtas_event_log_to_source’: hw/ppc/spapr_events.c:312:12: error: this statement may fall through [-Werror=implicit-fallthrough=] 312 | if (spapr_ovec_test(spapr->ov5_cas, OV5_HP_EVT)) { | ^ hw/ppc/spapr_events.c:317:5: note: here 317 | case RTAS_LOG_TYPE_EPOW: | ^~~~ cc1: all warnings being treated as errors Rewrite the comment using 'fall through' which is recognized by GCC and static analyzers. Reported-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/ppc/spapr_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)