This patch records and replays simulator shutdown event. Signed-off-by: Pavel Dovgalyuk <pavel.dovga...@ispras.ru> --- include/sysemu/sysemu.h | 1 + replay/replay-internal.h | 13 ++++++------- replay/replay.c | 11 +++++++++++ replay/replay.h | 5 +++++ vl.c | 8 +++++++- 5 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 1ebfef9..9000feb 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -57,6 +57,7 @@ void qemu_register_suspend_notifier(Notifier *notifier); void qemu_system_wakeup_request(WakeupReason reason); void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); +void qemu_system_shutdown_request_impl(void); void qemu_system_shutdown_request(void); void qemu_system_powerdown_request(void); void qemu_register_powerdown_notifier(Notifier *notifier); diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 79e23ee..033dbdc 100755 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -15,17 +15,16 @@ #include <stdio.h> #include "sysemu/sysemu.h" -<<<<<<< current -/* for software interrupt */ -#define EVENT_INTERRUPT 15 -/* for emulated exceptions */ -#define EVENT_EXCEPTION 23 -======= /* for time_t event */ #define EVENT_TIME_T 1 /* for tm event */ #define EVENT_TM 2 ->>>>>>> patched +/* for software interrupt */ +#define EVENT_INTERRUPT 15 +/* for shutdown request */ +#define EVENT_SHUTDOWN 20 +/* for emulated exceptions */ +#define EVENT_EXCEPTION 23 /* for async events */ #define EVENT_ASYNC 24 #define EVENT_ASYNC_OPT 25 diff --git a/replay/replay.c b/replay/replay.c index 41a27a9..2067d6b 100755 --- a/replay/replay.c +++ b/replay/replay.c @@ -43,6 +43,10 @@ bool skip_async_events(int stop_event) res = true; } switch (replay_data_kind) { + case EVENT_SHUTDOWN: + replay_has_unread_data = 0; + qemu_system_shutdown_request_impl(); + break; case EVENT_INSTRUCTION: first_cpu->instructions_count = replay_get_dword(); return res; @@ -201,3 +205,10 @@ bool replay_has_interrupt(void) } return false; } + +void replay_shutdown_request(void) +{ + if (replay_mode == REPLAY_SAVE) { + replay_put_event(EVENT_SHUTDOWN); + } +} diff --git a/replay/replay.h b/replay/replay.h index 16e368c..a84c57c 100755 --- a/replay/replay.h +++ b/replay/replay.h @@ -83,6 +83,11 @@ void replay_save_tm(struct tm *tm); /*! Reads struct tm value from the log. Stops execution in case of error */ void replay_read_tm(struct tm *tm); +/* Events */ + +/*! Called when qemu shutdown is requested. */ +void replay_shutdown_request(void); + /* Asynchronous events queue */ /*! Disables storing events in the queue */ diff --git a/vl.c b/vl.c index 86aba43..1a837e6 100644 --- a/vl.c +++ b/vl.c @@ -1929,13 +1929,19 @@ void qemu_system_killed(int signal, pid_t pid) qemu_system_shutdown_request(); } -void qemu_system_shutdown_request(void) +void qemu_system_shutdown_request_impl(void) { trace_qemu_system_shutdown_request(); shutdown_requested = 1; qemu_notify_event(); } +void qemu_system_shutdown_request(void) +{ + replay_shutdown_request(); + qemu_system_shutdown_request_impl(); +} + static void qemu_system_powerdown(void) { qapi_event_send_powerdown(&error_abort);