From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com,
crosthwaite.peter@gmail.com, boost.lists@gmail.com,
quintela@redhat.com, ciro.santilli@gmail.com,
jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com,
armbru@redhat.com, maria.klimushenkova@ispras.ru,
dovgaluk@ispras.ru, kraxel@redhat.com, pavel.dovgaluk@ispras.ru,
thomas.dullien@googlemail.com, pbonzini@redhat.com,
mreitz@redhat.com, alex.bennee@linaro.org, dgilbert@redhat.com,
rth@twiddle.net
Subject: [Qemu-devel] [RFC PATCH 08/17] replay: introduce info hmp/qmp command
Date: Wed, 25 Apr 2018 15:46:20 +0300 [thread overview]
Message-ID: <20180425124620.17182.7251.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20180425124533.17182.53165.stgit@pasha-VirtualBox>
This patch introduces 'info replay' monitor command and
corresponding qmp request.
These commands request the current record/replay mode, replay log file name,
and the execution step (number or recorded/replayed instructions).
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
---
hmp-commands-info.hx | 14 ++++++++++++++
hmp.h | 1 +
qapi/misc.json | 36 ++++++++++++++++++++++++++++++++++++
replay/Makefile.objs | 3 ++-
replay/replay-debugging.c | 41 +++++++++++++++++++++++++++++++++++++++++
replay/replay-internal.h | 2 ++
replay/replay.c | 3 +--
7 files changed, 97 insertions(+), 3 deletions(-)
create mode 100644 replay/replay-debugging.c
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index ddfcd5a..f5631be 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -883,6 +883,20 @@ STEXI
Show SEV information.
ETEXI
+ {
+ .name = "replay",
+ .args_type = "",
+ .params = "",
+ .help = "show parameters of the record/replay",
+ .cmd = hmp_info_replay,
+ },
+
+STEXI
+@item info replay
+@findex info replay
+Display the current record/replay mode and the currently executing step.
+ETEXI
+
STEXI
@end table
ETEXI
diff --git a/hmp.h b/hmp.h
index 4e2ec37..084fb62 100644
--- a/hmp.h
+++ b/hmp.h
@@ -144,5 +144,6 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict);
void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict);
void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict);
void hmp_info_sev(Monitor *mon, const QDict *qdict);
+void hmp_info_replay(Monitor *mon, const QDict *qdict);
#endif
diff --git a/qapi/misc.json b/qapi/misc.json
index 5636f4a..2ded924 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -3449,3 +3449,39 @@
##
{ 'command': 'x-oob-test', 'data' : { 'lock': 'bool' },
'allow-oob': true }
+
+##
+# @ReplayInfo:
+#
+# Status of the record/replay mode.
+#
+# @mode: current mode.
+#
+# @filename: name of the record/replay log file.
+#
+# @step: current step number.
+#
+# Since: 2.13
+#
+##
+{ 'struct': 'ReplayInfo',
+ 'data': { 'mode': 'ReplayMode', '*filename': 'str', 'step': 'int' } }
+
+
+##
+# @info_replay:
+#
+# Retrieves the status of the execution record/replay.
+#
+# Returns: structure with the properties of the record/replay.
+#
+# Since: 2.13
+#
+# Example:
+#
+# -> { "execute": "info_replay" }
+# <- { "return": { "mode": "play", "filename": "log.rr", "step": 220414 } }
+#
+##
+{ 'command': 'info_replay',
+ 'returns': 'ReplayInfo' }
diff --git a/replay/Makefile.objs b/replay/Makefile.objs
index cee6539..6694e3e 100644
--- a/replay/Makefile.objs
+++ b/replay/Makefile.objs
@@ -6,4 +6,5 @@ common-obj-y += replay-input.o
common-obj-y += replay-char.o
common-obj-y += replay-snapshot.o
common-obj-y += replay-net.o
-common-obj-y += replay-audio.o
\ No newline at end of file
+common-obj-y += replay-audio.o
+common-obj-y += replay-debugging.o
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
new file mode 100644
index 0000000..2777e57
--- /dev/null
+++ b/replay/replay-debugging.c
@@ -0,0 +1,41 @@
+/*
+ * replay-debugging.c
+ *
+ * Copyright (c) 2010-2018 Institute for System Programming
+ * of the Russian Academy of Sciences.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "sysemu/replay.h"
+#include "replay-internal.h"
+#include "hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/qapi-commands-misc.h"
+
+void hmp_info_replay(Monitor *mon, const QDict *qdict)
+{
+ if (replay_mode == REPLAY_MODE_NONE) {
+ monitor_printf(mon, "No record/replay\n");
+ } else {
+ monitor_printf(mon, "%s execution '%s': current step = %"PRId64"\n",
+ replay_mode == REPLAY_MODE_RECORD ? "Recording" : "Replaying",
+ replay_filename, replay_get_current_step());
+ }
+}
+
+ReplayInfo *qmp_info_replay(Error **errp)
+{
+ ReplayInfo *retval = g_new0(ReplayInfo, 1);
+ retval->mode = replay_mode;
+ if (replay_filename) {
+ retval->filename = g_strdup(replay_filename);
+ retval->has_filename = true;
+ }
+ retval->step = replay_get_current_step();
+ return retval;
+}
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index ac4b27b..ef82b5e 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -91,6 +91,8 @@ extern ReplayState replay_state;
/* File for replay writing */
extern FILE *replay_file;
+/*! Name of replay file */
+extern char *replay_filename;
void replay_put_byte(uint8_t byte);
void replay_put_event(uint8_t event);
diff --git a/replay/replay.c b/replay/replay.c
index 58a986f..8b70d7d 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -29,8 +29,7 @@
ReplayMode replay_mode = REPLAY_MODE_NONE;
char *replay_snapshot;
-/* Name of replay file */
-static char *replay_filename;
+char *replay_filename;
ReplayState replay_state;
static GSList *replay_blockers;
next prev parent reply other threads:[~2018-04-25 12:46 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-25 12:45 [Qemu-devel] [RFC PATCH 00/17] reverse debugging Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 01/17] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 02/17] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 03/17] replay: update docs for record/replay with block devices Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 04/17] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 05/17] replay: finish record/replay before closing the disks Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 06/17] migration: introduce icount field for snapshots Pavel Dovgalyuk
2018-04-25 18:59 ` Eric Blake
2018-04-26 9:40 ` Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 07/17] qcow2: " Pavel Dovgalyuk
2018-04-25 19:01 ` Eric Blake
2018-04-25 12:46 ` Pavel Dovgalyuk [this message]
2018-04-25 19:06 ` [Qemu-devel] [RFC PATCH 08/17] replay: introduce info hmp/qmp command Eric Blake
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 09/17] replay: introduce breakpoint at the specified step Pavel Dovgalyuk
2018-04-25 19:07 ` Eric Blake
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 10/17] replay: implement replay_seek command to proceed to the desired step Pavel Dovgalyuk
2018-04-25 19:07 ` Eric Blake
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 11/17] replay: flush events when exitting Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 12/17] timer: remove replay clock probe in deadline calculation Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 13/17] replay: refine replay-time module Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 14/17] translator: fix breakpoint processing Pavel Dovgalyuk
2018-04-25 12:47 ` [Qemu-devel] [RFC PATCH 15/17] replay: flush rr queue before loading the vmstate Pavel Dovgalyuk
2018-04-25 12:47 ` [Qemu-devel] [RFC PATCH 16/17] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2018-04-25 12:47 ` [Qemu-devel] [RFC PATCH 17/17] gdbstub: add reverse continue " Pavel Dovgalyuk
2018-04-25 12:48 ` [Qemu-devel] [RFC PATCH 00/17] reverse debugging Pavel Dovgalyuk
2018-04-26 12:21 ` Ciro Santilli
2018-04-26 12:34 ` Pavel Dovgalyuk
[not found] ` <CAFXrp_ddY34M8J+BwaRhPJrzxk=0XaQSBss1WnnZ8fNzAX+BjQ@mail.gmail.com>
[not found] ` <000401d3dec8$9c02c8d0$d4085a70$@ru>
2018-04-28 8:17 ` Ciro Santilli
2018-08-10 15:41 ` Ciro Santilli
[not found] ` <CAFXrp_dOLnuoBEhL0eUJtobRWq7gjgAR8X48Xb3JeNx1J4eHEw@mail.gmail.com>
2018-04-28 8:14 ` [Qemu-devel] Fwd: " Ciro Santilli
[not found] ` <000e01d3ded3$127660d0$37632270$@ru>
2018-04-28 9:38 ` [Qemu-devel] " Ciro Santilli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180425124620.17182.7251.stgit@pasha-VirtualBox \
--to=pavel.dovgaluk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=boost.lists@gmail.com \
--cc=ciro.santilli@gmail.com \
--cc=crosthwaite.peter@gmail.com \
--cc=dgilbert@redhat.com \
--cc=dovgaluk@ispras.ru \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=maria.klimushenkova@ispras.ru \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rth@twiddle.net \
--cc=thomas.dullien@googlemail.com \
--cc=war2jordan@live.com \
--cc=zuban32s@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).