diff options
| -rw-r--r-- | include/sysemu/replay.h | 3 | ||||
| -rw-r--r-- | replay/replay-internal.h | 3 | ||||
| -rw-r--r-- | replay/replay.c | 7 | ||||
| -rw-r--r-- | vl.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index f1c0712795..fa14d0ec0b 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -13,6 +13,7 @@ */ #include "qapi-types.h" +#include "sysemu.h" /* replay clock kinds */ enum ReplayClockKind { @@ -98,7 +99,7 @@ int64_t replay_read_clock(ReplayClockKind kind); /* Events */ /*! Called when qemu shutdown is requested. */ -void replay_shutdown_request(void); +void replay_shutdown_request(ShutdownCause cause); /*! Should be called at check points in the execution. These check points are skipped, if they were not met. Saves checkpoint in the SAVE mode and validates in the PLAY mode. diff --git a/replay/replay-internal.h b/replay/replay-internal.h index ed66ed803c..3ebb19912a 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -22,8 +22,9 @@ enum ReplayEvents { EVENT_EXCEPTION, /* for async events */ EVENT_ASYNC, - /* for shutdown request */ + /* for shutdown requests, range allows recovery of ShutdownCause */ EVENT_SHUTDOWN, + EVENT_SHUTDOWN_LAST = EVENT_SHUTDOWN + SHUTDOWN_CAUSE__MAX, /* for character device write event */ EVENT_CHAR_WRITE, /* for character device read all event */ diff --git a/replay/replay.c b/replay/replay.c index f810628cac..bf94e81261 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -49,8 +49,9 @@ bool replay_next_event_is(int event) res = true; } switch (replay_state.data_kind) { - case EVENT_SHUTDOWN: + case EVENT_SHUTDOWN ... EVENT_SHUTDOWN_LAST: replay_finish_event(); + /* TODO - pass replay_state.data_kind - EVENT_SHUTDOWN as cause */ qemu_system_shutdown_request(); break; default: @@ -170,11 +171,11 @@ bool replay_has_interrupt(void) return res; } -void replay_shutdown_request(void) +void replay_shutdown_request(ShutdownCause cause) { if (replay_mode == REPLAY_MODE_RECORD) { replay_mutex_lock(); - replay_put_event(EVENT_SHUTDOWN); + replay_put_event(EVENT_SHUTDOWN + cause); replay_mutex_unlock(); } } @@ -1821,8 +1821,8 @@ void qemu_system_killed(int signal, pid_t pid) void qemu_system_shutdown_request(void) { trace_qemu_system_shutdown_request(); - replay_shutdown_request(); /* TODO - add a parameter to allow callers to specify reason */ + replay_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR); shutdown_requested = SHUTDOWN_CAUSE_HOST_ERROR; qemu_notify_event(); } |