[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 20/21] replay: command line options
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v16 20/21] replay: command line options |
Date: |
Tue, 04 Aug 2015 11:45:43 +0300 |
User-agent: |
StGit/0.16 |
This patch introduces command line options for enabling recording or replaying
virtual machine behavior. These options are added to icount command line
parameter. They include 'rr' which switches between record and replay
and 'rrfile' for specifying the filename for replay log.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
qemu-options.hx | 8 ++++++--
replay/replay.c | 4 ++++
vl.c | 15 ++++++++++++---
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 77f5853..1d1ef0b 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3123,12 +3123,12 @@ re-inject them.
ETEXI
DEF("icount", HAS_ARG, QEMU_OPTION_icount, \
- "-icount [shift=N|auto][,align=on|off][,sleep=no]\n" \
+ "-icount
[shift=N|auto][,align=on|off][,sleep=no,rr=record|replay,rrfile=<filename>]\n" \
" enable virtual instruction counter with 2^N clock ticks
per\n" \
" instruction, enable aligning the host and virtual
clocks\n" \
" or disable real time cpu sleeping\n", QEMU_ARCH_ALL)
STEXI
address@hidden -icount address@hidden|auto]
address@hidden -icount address@hidden|auto][,rr=record|replay,address@hidden
@findex -icount
Enable virtual instruction counter. The virtual cpu will execute one
instruction every address@hidden ns of virtual time. If @code{auto} is
specified
@@ -3157,6 +3157,10 @@ Currently this option does not work when @option{shift}
is @code{auto}.
Note: The sync algorithm will work for those shift values for which
the guest clock runs ahead of the host clock. Typically this happens
when the shift value is high (how high depends on the host machine).
+
+When @option{rr} option is specified deterministic record/replay is enabled.
+Replay log is written into @var{filename} file in record mode and
+read from this file in replay mode.
ETEXI
DEF("watchdog", HAS_ARG, QEMU_OPTION_watchdog, \
diff --git a/replay/replay.c b/replay/replay.c
index 3c0e633..b478974 100755
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -294,6 +294,10 @@ void replay_start(void)
error_get_pretty(replay_blockers->data));
exit(1);
}
+ if (!use_icount) {
+ error_report("Please enable icount to use record/replay");
+ exit(1);
+ }
/* Timer for snapshotting will be set up here. */
diff --git a/vl.c b/vl.c
index 844cf49..14605a9 100644
--- a/vl.c
+++ b/vl.c
@@ -476,6 +476,12 @@ static QemuOptsList qemu_icount_opts = {
}, {
.name = "sleep",
.type = QEMU_OPT_BOOL,
+ }, {
+ .name = "rr",
+ .type = QEMU_OPT_STRING,
+ }, {
+ .name = "rrfile",
+ .type = QEMU_OPT_STRING,
},
{ /* end of list */ }
},
@@ -4023,6 +4029,8 @@ int main(int argc, char **argv, char **envp)
}
}
+ replay_configure(icount_opts);
+
opts = qemu_get_machine_opts();
optarg = qemu_opt_get(opts, "type");
if (optarg) {
@@ -4456,9 +4464,10 @@ int main(int argc, char **argv, char **envp)
}
/* open the virtual block devices */
- if (snapshot)
- qemu_opts_foreach(qemu_find_opts("drive"),
- drive_enable_snapshot, NULL, NULL);
+ if (snapshot || replay_mode != REPLAY_MODE_NONE) {
+ qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
+ NULL, NULL);
+ }
if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
&machine_class->block_default_type, NULL)) {
exit(1);
- [Qemu-devel] [PATCH v16 05/21] replay: introduce mutex to protect the replay log, (continued)
- [Qemu-devel] [PATCH v16 05/21] replay: introduce mutex to protect the replay log, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 06/21] replay: introduce icount event, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 07/21] cpu-exec: allow temporary disabling icount, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 08/21] cpu: replay instructions sequence, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 09/21] i386: interrupt poll processing, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 10/21] replay: interrupts and exceptions, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 11/21] replay: asynchronous events infrastructure, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 12/21] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 18/21] replay: initialization and deinitialization, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 19/21] replay: replay blockers for devices, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 20/21] replay: command line options,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v16 21/21] replay: recording of the user input, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 15/21] bottom halves: introduce bh call function, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 17/21] typedef: add typedef for QemuOpts, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 16/21] replay: ptimer, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 13/21] replay: shutdown event, Pavel Dovgalyuk, 2015/08/04
- [Qemu-devel] [PATCH v16 14/21] replay: checkpoints, Pavel Dovgalyuk, 2015/08/04
- Re: [Qemu-devel] [PATCH v16 00/21] Deterministic replay core, Pavel Dovgalyuk, 2015/08/15