[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [for-4.2 PATCH v2 4/8] replay: fix replay shutdown
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [for-4.2 PATCH v2 4/8] replay: fix replay shutdown |
Date: |
Thu, 25 Jul 2019 11:44:32 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Pavel Dovgalyuk <address@hidden>
This patch fixes shutdown of the replay process, which is terminated with
the assert when shutdown event is read from the log.
replay_finish_event reads new data_kind and therefore the value of data_kind
should be preserved to be valid at qemu_system_shutdown_request call.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
replay/replay.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/replay/replay.c b/replay/replay.c
index 8b172b2d1b..8d77a4ca4c 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -45,14 +45,14 @@ bool replay_next_event_is(int event)
}
while (true) {
- if (event == replay_state.data_kind) {
+ unsigned int data_kind = replay_state.data_kind;
+ if (event == data_kind) {
res = true;
}
- switch (replay_state.data_kind) {
+ switch (data_kind) {
case EVENT_SHUTDOWN ... EVENT_SHUTDOWN_LAST:
replay_finish_event();
- qemu_system_shutdown_request(replay_state.data_kind -
- EVENT_SHUTDOWN);
+ qemu_system_shutdown_request(data_kind - EVENT_SHUTDOWN);
break;
default:
/* clock, time_t, checkpoint and other events */
- [Qemu-devel] [for-4.2 PATCH v2 0/8] Some record/replay fixes, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 1/8] replay: add missing fix for internal function, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 2/8] replay: document development rules, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 3/8] util/qemu-timer: refactor deadline calculation for external timers, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 4/8] replay: fix replay shutdown,
Pavel Dovgalyuk <=
- [Qemu-devel] [for-4.2 PATCH v2 5/8] replay: refine replay-time module, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 6/8] replay: rename step-related variables and functions, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 7/8] icount: clean up cpu_can_io at the entry to the block, Pavel Dovgalyuk, 2019/07/25
- [Qemu-devel] [for-4.2 PATCH v2 8/8] icount: remove unnecessary gen_io_end calls, Pavel Dovgalyuk, 2019/07/25