[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v13 11/25] replay: introduce info hmp/qmp command
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v13 11/25] replay: introduce info hmp/qmp command |
Date: |
Thu, 21 Feb 2019 14:05:06 +0300 |
User-agent: |
StGit/0.17.1-dirty |
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 instruction count (number of recorded/replayed
instructions). The instruction count can be used with the
replay_seek/replay_break commands added in the next two patches.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
Acked-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Markus Armbruster <address@hidden>
--
v2:
- renamed info_replay qmp into query-replay (suggested by Eric Blake)
v7:
- added empty line (suggested by Markus Armbruster)
v9:
- changed 'step' parameter name to 'icount'
- moved json stuff to replay.json and updated the descriptions
(suggested by Markus Armbruster)
v10:
- updated descriptions and messages for rr stuff
---
hmp-commands-info.hx | 14 ++++++++++++++
hmp.h | 1 +
qapi/block-core.json | 3 ++-
qapi/replay.json | 39 +++++++++++++++++++++++++++++++++++++++
replay/Makefile.objs | 3 ++-
replay/replay-debugging.c | 43 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 101 insertions(+), 2 deletions(-)
create mode 100644 replay/replay-debugging.c
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index cbee8b944d..7cc0baadba 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -916,6 +916,20 @@ STEXI
@item info sev
@findex info sev
Show SEV information.
+ETEXI
+
+ {
+ .name = "replay",
+ .args_type = "",
+ .params = "",
+ .help = "show record/replay information",
+ .cmd = hmp_info_replay,
+ },
+
+STEXI
address@hidden info replay
address@hidden info replay
+Display the record/replay information: mode and the current icount.
ETEXI
STEXI
diff --git a/hmp.h b/hmp.h
index 5f1addcca2..d792149f24 100644
--- a/hmp.h
+++ b/hmp.h
@@ -148,5 +148,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/block-core.json b/qapi/block-core.json
index 6a665cb4b9..349204db2d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -28,7 +28,8 @@
#
# @icount: Current instruction count. Appears when execution record/replay
# is enabled. Used for "time-traveling" to match the moment
-# in the recorded execution with the snapshots. (since 4.0)
+# in the recorded execution with the snapshots. This counter may
+# be obtained through @query-replay command (since 4.0)
#
# Since: 1.3
#
diff --git a/qapi/replay.json b/qapi/replay.json
index 9e13551d20..4206150544 100644
--- a/qapi/replay.json
+++ b/qapi/replay.json
@@ -24,3 +24,42 @@
##
{ 'enum': 'ReplayMode',
'data': [ 'none', 'record', 'play' ] }
+
+##
+# @ReplayInfo:
+#
+# Record/replay information.
+#
+# @mode: current mode.
+#
+# @filename: name of the record/replay log file.
+# It is present only in record or replay modes, when the log
+# is recorded or replayed.
+#
+# @icount: current number of executed instructions.
+#
+# Since: 4.0
+#
+##
+{ 'struct': 'ReplayInfo',
+ 'data': { 'mode': 'ReplayMode', '*filename': 'str', 'icount': 'int' } }
+
+##
+# @query-replay:
+#
+# Retrieve the record/replay information.
+# It includes current instruction count which may be used for
+# @replay-break and @replay-seek commands.
+#
+# Returns: record/replay information.
+#
+# Since: 4.0
+#
+# Example:
+#
+# -> { "execute": "query-replay" }
+# <- { "return": { "mode": "play", "filename": "log.rr", "icount": 220414 } }
+#
+##
+{ 'command': 'query-replay',
+ 'returns': 'ReplayInfo' }
diff --git a/replay/Makefile.objs b/replay/Makefile.objs
index cee6539a23..6694e3e2a2 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 0000000000..51f1c4d82d
--- /dev/null
+++ b/replay/replay-debugging.c
@@ -0,0 +1,43 @@
+/*
+ * 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-replay.h"
+
+void hmp_info_replay(Monitor *mon, const QDict *qdict)
+{
+ if (replay_mode == REPLAY_MODE_NONE) {
+ monitor_printf(mon, "Record/replay is not active\n");
+ } else {
+ monitor_printf(mon,
+ "%s execution '%s': instruction count = %"PRId64"\n",
+ replay_mode == REPLAY_MODE_RECORD ? "Recording" : "Replaying",
+ replay_get_filename(), replay_get_current_step());
+ }
+}
+
+ReplayInfo *qmp_query_replay(Error **errp)
+{
+ ReplayInfo *retval = g_new0(ReplayInfo, 1);
+
+ retval->mode = replay_mode;
+ if (replay_get_filename()) {
+ retval->filename = g_strdup(replay_get_filename());
+ retval->has_filename = true;
+ }
+ retval->icount = replay_get_current_step();
+ return retval;
+}
- [Qemu-devel] [PATCH v13 01/25] replay: add missing fix for internal function, (continued)
- [Qemu-devel] [PATCH v13 01/25] replay: add missing fix for internal function, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 02/25] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 03/25] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 05/25] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 04/25] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 06/25] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 09/25] replay: provide an accessor for rr filename, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 08/25] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 07/25] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 10/25] qapi: introduce replay.json for record/replay-related stuff, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 11/25] replay: introduce info hmp/qmp command,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v13 12/25] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 13/25] replay: implement replay-seek command, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 16/25] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 14/25] replay: refine replay-time module, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 18/25] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 15/25] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 17/25] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 19/25] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 20/25] replay: init rtc after enabling the replay, Pavel Dovgalyuk, 2019/02/21
- [Qemu-devel] [PATCH v13 21/25] replay: document development rules, Pavel Dovgalyuk, 2019/02/21