[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/18] replay: shutdown event
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/18] replay: shutdown event |
Date: |
Thu, 5 Nov 2015 13:13:55 +0100 |
From: Pavel Dovgalyuk <address@hidden>
This patch records and replays simulator shutdown event.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
include/sysemu/replay.h | 5 +++++
replay/replay-internal.h | 2 ++
replay/replay.c | 14 ++++++++++++++
vl.c | 2 ++
4 files changed, 23 insertions(+)
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 2398509..fcc93d1 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -66,6 +66,11 @@ int64_t replay_read_clock(ReplayClockKind kind);
? replay_save_clock((clock), (value)) \
: (value))
+/* Events */
+
+/*! Called when qemu shutdown is requested. */
+void replay_shutdown_request(void);
+
/* Asynchronous events queue */
/*! Disables storing events in the queue */
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index f042c46..4414695 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -23,6 +23,8 @@ enum ReplayEvents {
EVENT_EXCEPTION,
/* for async events */
EVENT_ASYNC,
+ /* for shutdown request */
+ EVENT_SHUTDOWN,
/* for clock read/writes */
/* some of greater codes are reserved for clocks */
EVENT_CLOCK,
diff --git a/replay/replay.c b/replay/replay.c
index b4fc64a..65dca7f 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -14,6 +14,7 @@
#include "replay-internal.h"
#include "qemu/timer.h"
#include "qemu/main-loop.h"
+#include "sysemu/sysemu.h"
ReplayMode replay_mode = REPLAY_MODE_NONE;
@@ -34,6 +35,10 @@ bool replay_next_event_is(int event)
res = true;
}
switch (replay_data_kind) {
+ case EVENT_SHUTDOWN:
+ replay_finish_event();
+ qemu_system_shutdown_request();
+ break;
default:
/* clock, time_t, checkpoint and other events */
return res;
@@ -146,3 +151,12 @@ bool replay_has_interrupt(void)
}
return res;
}
+
+void replay_shutdown_request(void)
+{
+ if (replay_mode == REPLAY_MODE_RECORD) {
+ replay_mutex_lock();
+ replay_put_event(EVENT_SHUTDOWN);
+ replay_mutex_unlock();
+ }
+}
diff --git a/vl.c b/vl.c
index 601ace2..f481a1e 100644
--- a/vl.c
+++ b/vl.c
@@ -122,6 +122,7 @@ int main(int argc, char **argv)
#include "qapi-event.h"
#include "exec/semihost.h"
#include "crypto/init.h"
+#include "sysemu/replay.h"
#define MAX_VIRTIO_CONSOLES 1
#define MAX_SCLP_CONSOLES 1
@@ -1803,6 +1804,7 @@ void qemu_system_killed(int signal, pid_t pid)
void qemu_system_shutdown_request(void)
{
trace_qemu_system_shutdown_request();
+ replay_shutdown_request();
shutdown_requested = 1;
qemu_notify_event();
}
--
1.8.3.1
- [Qemu-devel] [PULL 03/18] replay: introduce mutex to protect the replay log, (continued)
- [Qemu-devel] [PULL 03/18] replay: introduce mutex to protect the replay log, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 07/18] replay: interrupts and exceptions, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 06/18] cpu: replay instructions sequence, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 08/18] replay: asynchronous events infrastructure, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 11/18] icount: improve counting for record/replay, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 14/18] replay: ptimer, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 13/18] bottom halves: introduce bh call function, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 15/18] replay: initialization and deinitialization, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 16/18] replay: replay blockers for devices, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 09/18] replay: recording and replaying clock ticks, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 10/18] replay: shutdown event,
Paolo Bonzini <=
- [Qemu-devel] [PULL 17/18] replay: command line options, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 12/18] replay: checkpoints, Paolo Bonzini, 2015/11/05
- [Qemu-devel] [PULL 18/18] replay: recording of the user input, Paolo Bonzini, 2015/11/05
- Re: [Qemu-devel] [PULL 00/18] Record/replay core for 2.5-rc1, Peter Maydell, 2015/11/05