Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock

[Stefan Hajnoczi]

On Tue, 29 Nov 2022 at 02:39, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 29/11/22 02:05, Richard Henderson wrote:
> > Fixes the build with gcc 13:
> >
> > replay/replay-time.c:34:6: error: conflicting types for  \
> >    'replay_read_next_clock' due to enum/integer mismatch; \
> >    have 'void(ReplayClockKind)' [-Werror=enum-int-mismatch]
> >     34 | void replay_read_next_clock(ReplayClockKind kind)
> >        |      ^~~~~~~~~~~~~~~~~~~~~~
> > In file included from ../qemu/replay/replay-time.c:14:
> > replay/replay-internal.h:139:6: note: previous declaration of \
> >    'replay_read_next_clock' with type 'void(unsigned int)'
> >    139 | void replay_read_next_clock(unsigned int kind);
> >        |      ^~~~~~~~~~~~~~~~~~~~~~
> >
> > Fixes: 8eda206e090 ("replay: recording and replaying clock ticks")
> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> > ---
> >   replay/replay-internal.h | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/replay/replay-internal.h b/replay/replay-internal.h
> > index 89e377be90..b6836354ac 100644
> > --- a/replay/replay-internal.h
> > +++ b/replay/replay-internal.h
> > @@ -136,7 +136,7 @@ bool replay_next_event_is(int event);
> >   /*! Reads next clock value from the file.
> >       If clock kind read from the file is different from the parameter,
> >       the value is not used. */
> > -void replay_read_next_clock(unsigned int kind);
> > +void replay_read_next_clock(ReplayClockKind kind);
>
> Preferably having this file including "sysemu/replay.h" in the same
> patch:

ReplayClockKind isn't declared by anything in replay-internal.h but I
see another instance of this in the file (e.g. InputEvent).

Maybe send a follow-up patch for 8.0 that cleans up the #includes?

Stefan