From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu0lW-0003KQ-UN for qemu-devel@nongnu.org; Wed, 04 Nov 2015 11:18:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zu0lS-0002CG-QC for qemu-devel@nongnu.org; Wed, 04 Nov 2015 11:18:26 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:34331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu0lS-0002C8-F2 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 11:18:22 -0500 Received: by wmff134 with SMTP id f134so114546905wmf.1 for ; Wed, 04 Nov 2015 08:18:21 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 4 Nov 2015 17:17:55 +0100 Message-Id: <1446653876-116008-18-git-send-email-pbonzini@redhat.com> In-Reply-To: <1446653876-116008-1-git-send-email-pbonzini@redhat.com> References: <1446653876-116008-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 17/18] replay: command line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Pavel Dovgalyuk From: Pavel Dovgalyuk 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 Message-Id: <20150917162518.8676.70792.stgit@PASHA-ISP.def.inno> Signed-off-by: Paolo Bonzini --- 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 949db7f..0eea4ee 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3157,12 +3157,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=]\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 -@item -icount [shift=@var{N}|auto] +@item -icount [shift=@var{N}|auto][,rr=record|replay,rrfile=@var{filename}] @findex -icount Enable virtual instruction counter. The virtual cpu will execute one instruction every 2^@var{N} ns of virtual time. If @code{auto} is specified @@ -3191,6 +3191,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 1373346..0d33e82 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -295,6 +295,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 42a3b0d..6d67f90 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 */ } }, @@ -4020,6 +4026,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) { @@ -4453,9 +4461,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); -- 1.8.3.1