[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v11 22/23] replay: command line options
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v11 22/23] replay: command line options |
Date: |
Mon, 27 Apr 2015 10:34:18 +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 319d971..a6f42c4 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 22c5c68..d1d065a 100644
--- a/vl.c
+++ b/vl.c
@@ -470,6 +470,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 */ }
},
@@ -2744,6 +2750,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;
@@ -3772,6 +3779,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) {
@@ -4173,8 +4182,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 v11 12/23] replay: recording and replaying clock ticks, (continued)
- [Qemu-devel] [RFC PATCH v11 12/23] replay: recording and replaying clock ticks, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 13/23] replay: shutdown event, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 14/23] replay: checkpoints, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 15/23] aio: replace stack of bottom halves with queue, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 16/23] replay: bottom halves, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 17/23] replay: replay aio requests, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 18/23] replay: thread pool, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 19/23] typedef: add typedef for QemuOpts, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 20/23] replay: initialization and deinitialization, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 21/23] replay: replay blockers for devices, Pavel Dovgalyuk, 2015/04/27
- [Qemu-devel] [RFC PATCH v11 22/23] replay: command line options,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v11 23/23] replay: recording of the user input, Pavel Dovgalyuk, 2015/04/27
- Re: [Qemu-devel] [RFC PATCH v11 00/23] Deterministic replay core, Paolo Bonzini, 2015/04/30