86bdfa9211
- sync some bugfix patches from upstream - fix the virtio features negotiation flaw - fix CVE-2022-4144 Signed-off-by: yezengruan <yezengruan@huawei.com>
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From 8c499e212fedfaa4323541d97a33187ea96ba555 Mon Sep 17 00:00:00 2001
|
|
From: tangzhongrui <tangzhongrui@cmss.chinamobile.com>
|
|
Date: Thu, 1 Dec 2022 18:58:34 +0800
|
|
Subject: [PATCH 08/17] replay: Fix declaration of replay_read_next_clock
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Reviewed-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
|
|
Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-Id: <20221129010547.284051-1-richard.henderson@linaro.org>
|
|
|
|
Signed-off-by: tangzhongrui <tangzhongrui@cmss.chinamobile.com>
|
|
---
|
|
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 */
|
|
|
|
--
|
|
2.27.0
|
|
|