[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v13 20/21] replay: command line options
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v13 20/21] replay: command line options |
Date: |
Wed, 06 May 2015 17:04:38 +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, 23 insertions(+), 4 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index ec356f6..fcb5ddc 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3086,11 +3086,11 @@ re-inject them.
ETEXI
DEF("icount", HAS_ARG, QEMU_OPTION_icount, \
- "-icount [shift=N|auto][,align=on|off]\n" \
+ "-icount
[shift=N|auto][,align=on|off][,rr=record|replay,rrfile=<filename>]\n" \
" enable virtual instruction counter with 2^N clock ticks
per\n" \
" instruction and enable aligning the host and virtual
clocks\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
@@ -3112,6 +3112,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 9e0fceb..b5abbb0 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 e8c526b..20cf8af 100644
--- a/vl.c
+++ b/vl.c
@@ -471,6 +471,12 @@ static QemuOptsList qemu_icount_opts = {
}, {
.name = "align",
.type = QEMU_OPT_BOOL,
+ }, {
+ .name = "rr",
+ .type = QEMU_OPT_STRING,
+ }, {
+ .name = "rrfile",
+ .type = QEMU_OPT_STRING,
},
{ /* end of list */ }
},
@@ -2754,6 +2760,7 @@ int main(int argc, char **argv, char **envp)
{
int i;
int snapshot, linux_boot;
+ const char *icount_option = NULL;
const char *initrd_filename;
const char *kernel_filename, *kernel_cmdline;
const char *boot_order = NULL;
@@ -3782,6 +3789,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) {
@@ -4196,8 +4205,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, 0);
+ if (snapshot || replay_mode != REPLAY_MODE_NONE) {
+ qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
+ NULL, 0);
+ }
if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
&machine_class->block_default_type, 1) != 0) {
exit(1);
- [Qemu-devel] [RFC PATCH v13 12/21] replay: recording and replaying clock ticks, (continued)
- [Qemu-devel] [RFC PATCH v13 12/21] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 13/21] replay: shutdown event, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 14/21] replay: checkpoints, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 16/21] replay: ptimer, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 15/21] bottom halves: introduce bh call function, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 17/21] typedef: add typedef for QemuOpts, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 18/21] replay: initialization and deinitialization, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 19/21] replay: replay blockers for devices, Pavel Dovgalyuk, 2015/05/06
- [Qemu-devel] [RFC PATCH v13 20/21] replay: command line options,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v13 21/21] replay: recording of the user input, Pavel Dovgalyuk, 2015/05/06
- Re: [Qemu-devel] [RFC PATCH v13 00/21] Deterministic replay core, Pavel Dovgaluk, 2015/05/19