* [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
@ 2022-11-29 1:05 Richard Henderson
2022-11-29 6:55 ` Pavel Dovgalyuk
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Richard Henderson @ 2022-11-29 1:05 UTC (permalink / raw)
To: qemu-devel; +Cc: pavel.dovgaluk, stefanha
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
2022-11-29 1:05 [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock Richard Henderson
@ 2022-11-29 6:55 ` Pavel Dovgalyuk
2022-11-29 7:03 ` Wilfred Mallawa
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Pavel Dovgalyuk @ 2022-11-29 6:55 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pavel.dovgaluk, stefanha
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 */
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
2022-11-29 1:05 [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock Richard Henderson
2022-11-29 6:55 ` Pavel Dovgalyuk
@ 2022-11-29 7:03 ` Wilfred Mallawa
2022-11-29 7:39 ` Philippe Mathieu-Daudé
2022-11-29 19:08 ` Stefan Hajnoczi
3 siblings, 0 replies; 7+ messages in thread
From: Wilfred Mallawa @ 2022-11-29 7:03 UTC (permalink / raw)
To: richard.henderson@linaro.org, qemu-devel@nongnu.org
Cc: stefanha@gmail.com, pavel.dovgaluk@ispras.ru
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 */
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
2022-11-29 1:05 [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock Richard Henderson
2022-11-29 6:55 ` Pavel Dovgalyuk
2022-11-29 7:03 ` Wilfred Mallawa
@ 2022-11-29 7:39 ` Philippe Mathieu-Daudé
2022-11-29 16:13 ` Stefan Hajnoczi
2022-11-29 19:08 ` Stefan Hajnoczi
3 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-11-29 7:39 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pavel.dovgaluk, stefanha
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>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
2022-11-29 7:39 ` Philippe Mathieu-Daudé
@ 2022-11-29 16:13 ` Stefan Hajnoczi
2022-11-29 17:44 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 7+ messages in thread
From: Stefan Hajnoczi @ 2022-11-29 16:13 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Richard Henderson, qemu-devel, pavel.dovgaluk
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
2022-11-29 16:13 ` Stefan Hajnoczi
@ 2022-11-29 17:44 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-11-29 17:44 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Richard Henderson, qemu-devel, pavel.dovgaluk
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!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock
2022-11-29 1:05 [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock Richard Henderson
` (2 preceding siblings ...)
2022-11-29 7:39 ` Philippe Mathieu-Daudé
@ 2022-11-29 19:08 ` Stefan Hajnoczi
3 siblings, 0 replies; 7+ messages in thread
From: Stefan Hajnoczi @ 2022-11-29 19:08 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, pavel.dovgaluk
Merged, thanks!
Stefan
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-11-29 19:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-29 1:05 [PATCH for-7.2] replay: Fix declaration of replay_read_next_clock Richard Henderson
2022-11-29 6:55 ` Pavel Dovgalyuk
2022-11-29 7:03 ` Wilfred Mallawa
2022-11-29 7:39 ` Philippe Mathieu-Daudé
2022-11-29 16:13 ` Stefan Hajnoczi
2022-11-29 17:44 ` Philippe Mathieu-Daudé
2022-11-29 19:08 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).