replay: Fix declaration of replay_read_next_clock

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

Posted by Richard Henderson 1 year, 4 months ago

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);
 
 /* Asynchronous events queue */
 
-- 
2.34.1

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

Posted by Stefan Hajnoczi 1 year, 4 months ago

Merged, thanks!

Stefan

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

Posted by Philippe Mathieu-Daudé 1 year, 4 months ago

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:

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

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

Posted by Stefan Hajnoczi 1 year, 4 months ago

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

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

Posted by Philippe Mathieu-Daudé 1 year, 4 months ago

On 29/11/22 17:13, Stefan Hajnoczi wrote:
> 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?

Sure!

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

Posted by Wilfred Mallawa 1 year, 4 months ago

On Mon, 2022-11-28 at 17:05 -0800, 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(-)
> 
Reviewed-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
> 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);
>  
>  /* Asynchronous events queue */
>

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

Posted by Pavel Dovgalyuk 1 year, 4 months ago

Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>

On 29.11.2022 04: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);
>   
>   /* Asynchronous events queue */
>