[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen stable-4.17] replay: Fix declaration of replay_read_next_clock



commit 97e8df50760afab883f7d58a0c8dcde30aa28e0f
Author:     Richard Henderson <richard.henderson@xxxxxxxxxx>
AuthorDate: Mon Nov 28 17:05:47 2022 -0800
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Fri Jul 21 11:08:48 2023 +0100

    replay: Fix declaration of replay_read_next_clock
    
    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@xxxxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Reviewed-by: Wilfred Mallawa <wilfred.mallawa@xxxxxxx>
    Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@xxxxxxxxx>
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
    Message-Id: <20221129010547.284051-1-richard.henderson@xxxxxxxxxx>
    (cherry picked from commit fb72e779ebe3a51f55b16a49738380ee3e54c7d5)
---
 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 97649ed8d7..b4238226f4 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -141,7 +141,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 */
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.17



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.