For clarity given it only has two states.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231211091346.14616-9-alex.bennee@linaro.org>
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index 98ca3748edb..1bc8fd50868 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -75,7 +75,7 @@ enum ReplayEvents {
* @current_icount: number of processed instructions
* @instruction_count: number of instructions until next event
* @data_kind: current event
- * @has_unread_data: 1 if event not yet processed
+ * @has_unread_data: true if event not yet processed
* @file_offset: offset into replay log at replay snapshot
* @block_request_id: current serialised block request id
* @read_event_id: current async read event id
@@ -85,7 +85,7 @@ typedef struct ReplayState {
uint64_t current_icount;
int instruction_count;
unsigned int data_kind;
- unsigned int has_unread_data;
+ bool has_unread_data;
uint64_t file_offset;
uint64_t block_request_id;
uint64_t read_event_id;
diff --git a/replay/replay-internal.c b/replay/replay-internal.c
index 77d0c82327e..634025096ef 100644
--- a/replay/replay-internal.c
+++ b/replay/replay-internal.c
@@ -179,7 +179,7 @@ void replay_fetch_data_kind(void)
replay_state.instruction_count = replay_get_dword();
}
replay_check_error();
- replay_state.has_unread_data = 1;
+ replay_state.has_unread_data = true;
if (replay_state.data_kind >= EVENT_COUNT) {
error_report("Replay: unknown event kind %d",
replay_state.data_kind);
@@ -191,7 +191,7 @@ void replay_fetch_data_kind(void)
void replay_finish_event(void)
{
- replay_state.has_unread_data = 0;
+ replay_state.has_unread_data = false;
replay_fetch_data_kind();
}
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index e5e39161e33..d4f6cb7cda8 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -47,8 +47,8 @@ static int replay_post_load(void *opaque, int version_id)
static const VMStateDescription vmstate_replay = {
.name = "replay",
- .version_id = 2,
- .minimum_version_id = 2,
+ .version_id = 3,
+ .minimum_version_id = 3,
.pre_save = replay_pre_save,
.post_load = replay_post_load,
.fields = (const VMStateField[]) {
@@ -56,7 +56,7 @@ static const VMStateDescription vmstate_replay = {
VMSTATE_UINT64(current_icount, ReplayState),
VMSTATE_INT32(instruction_count, ReplayState),
VMSTATE_UINT32(data_kind, ReplayState),
- VMSTATE_UINT32(has_unread_data, ReplayState),
+ VMSTATE_BOOL(has_unread_data, ReplayState),
VMSTATE_UINT64(file_offset, ReplayState),
VMSTATE_UINT64(block_request_id, ReplayState),
VMSTATE_UINT64(read_event_id, ReplayState),
--
2.39.2