[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[for-5.0 PATCH 05/11] replay: introduce info hmp/qmp command
From: |
Pavel Dovgalyuk |
Subject: |
[for-5.0 PATCH 05/11] replay: introduce info hmp/qmp command |
Date: |
Mon, 23 Dec 2019 12:47:31 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Pavel Dovgalyuk <address@hidden>
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 ++++++++++++++
include/monitor/hmp.h | 1 +
qapi/block-core.json | 3 ++-
qapi/replay.json | 39 +++++++++++++++++++++++++++++++++++++++
replay/Makefile.objs | 1 +
replay/replay-debugging.c | 43 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 replay/replay-debugging.c
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 257ee7d7a3..0288860db0 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -930,6 +930,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
+@item info replay
+@findex info replay
+Display the record/replay information: mode and the current icount.
ETEXI
STEXI
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 3d329853b2..783784cf10 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -153,5 +153,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 db3e435c74..1b665b1ad4 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 5.0)
+# in the recorded execution with the snapshots. This counter may
+# be obtained through @query-replay command (since 5.0)
#
# Since: 1.3
#
diff --git a/qapi/replay.json b/qapi/replay.json
index 9e13551d20..67f2d1f859 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: 5.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: 5.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 939be964a9..f847c5c023 100644
--- a/replay/Makefile.objs
+++ b/replay/Makefile.objs
@@ -8,3 +8,4 @@ common-obj-y += replay-snapshot.o
common-obj-y += replay-net.o
common-obj-y += replay-audio.o
common-obj-y += replay-random.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..8cf15ebc11
--- /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 "monitor/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_icount());
+ }
+}
+
+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_icount();
+ return retval;
+}
- [for-5.0 PATCH 00/11] Support for reverse debugging with GDB, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 01/11] replay: provide an accessor for rr filename, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 02/11] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 03/11] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 04/11] qapi: introduce replay.json for record/replay-related stuff, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 05/11] replay: introduce info hmp/qmp command,
Pavel Dovgalyuk <=
- [for-5.0 PATCH 06/11] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 07/11] replay: implement replay-seek command, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 08/11] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 09/11] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 10/11] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2019/12/23
- [for-5.0 PATCH 11/11] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2019/12/23