[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 13/25] replay: implement replay-seek command
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v12 13/25] replay: implement replay-seek command |
Date: |
Tue, 05 Feb 2019 11:20:56 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This patch adds hmp/qmp commands replay_seek/replay-seek that proceed
the execution to the specified instruction count.
The command automatically loads nearest snapshot and replays the execution
to find the desired instruction count.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
Acked-by: Markus Armbruster <address@hidden>
--
v2:
- renamed replay_seek qmp command into replay-seek
(suggested by Eric Blake)
v7:
- small fixes related to Markus Armbruster's review
v9:
- changed 'step' parameter name to 'icount'
- moved json stuff to replay.json and updated the description
(suggested by Markus Armbruster)
v10:
- updated the descriptions
---
hmp-commands.hx | 19 +++++++++
hmp.h | 1
qapi/replay.json | 20 ++++++++++
replay/replay-debugging.c | 92 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 2ec8cb8254..3c077a55e6 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1921,6 +1921,25 @@ STEXI
@findex replay_delete_break
Remove replay breakpoint which was previously set with replay_break.
The command is ignored when there are no replay breakpoints.
+ETEXI
+
+ {
+ .name = "replay_seek",
+ .args_type = "icount:i",
+ .params = "icount",
+ .help = "replay execution to the specified instruction count",
+ .cmd = hmp_replay_seek,
+ },
+
+STEXI
address@hidden replay_seek @var{icount}
address@hidden replay_seek
+Automatically proceed to the instruction count @var{icount}, when
+replaying the execution. The command automatically loads nearest
+snapshot and replays the execution to find the desired instruction.
+When there is no preceding snapshot or the execution is not replayed,
+then the command fails.
+icount for the reference may be observed with 'info replay' command.
ETEXI
{
diff --git a/hmp.h b/hmp.h
index c9b9b4f8c4..d6e1d7e90b 100644
--- a/hmp.h
+++ b/hmp.h
@@ -151,5 +151,6 @@ void hmp_info_sev(Monitor *mon, const QDict *qdict);
void hmp_info_replay(Monitor *mon, const QDict *qdict);
void hmp_replay_break(Monitor *mon, const QDict *qdict);
void hmp_replay_delete_break(Monitor *mon, const QDict *qdict);
+void hmp_replay_seek(Monitor *mon, const QDict *qdict);
#endif
diff --git a/qapi/replay.json b/qapi/replay.json
index 84c148cc4e..550fb2e6cf 100644
--- a/qapi/replay.json
+++ b/qapi/replay.json
@@ -99,3 +99,23 @@
#
##
{ 'command': 'replay-delete-break' }
+
+##
+# @replay-seek:
+#
+# Automatically proceed to the instruction count @icount, when
+# replaying the execution. The command automatically loads nearest
+# snapshot and replays the execution to find the desired instruction.
+# When there is no preceding snapshot or the execution is not replayed,
+# then the command fails.
+# icount for the reference may be obtained with @query-replay command.
+#
+# @icount: target instruction count
+#
+# Since: 4.0
+#
+# Example:
+#
+# -> { "execute": "replay-seek", "data": { "icount": 220414 } }
+##
+{ 'command': 'replay-seek', 'data': { 'icount': 'int' } }
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
index a94685e437..e3821ab1ba 100644
--- a/replay/replay-debugging.c
+++ b/replay/replay-debugging.c
@@ -18,6 +18,8 @@
#include "qapi/qapi-commands-replay.h"
#include "qapi/qmp/qdict.h"
#include "qemu/timer.h"
+#include "block/snapshot.h"
+#include "migration/snapshot.h"
void hmp_info_replay(Monitor *mon, const QDict *qdict)
{
@@ -127,3 +129,93 @@ void hmp_replay_delete_break(Monitor *mon, const QDict
*qdict)
return;
}
}
+
+static char *replay_find_nearest_snapshot(int64_t icount,
+ int64_t *snapshot_icount)
+{
+ BlockDriverState *bs;
+ QEMUSnapshotInfo *sn_tab;
+ QEMUSnapshotInfo *nearest = NULL;
+ char *ret = NULL;
+ int nb_sns, i;
+ AioContext *aio_context;
+
+ *snapshot_icount = -1;
+
+ bs = bdrv_all_find_vmstate_bs();
+ if (!bs) {
+ goto fail;
+ }
+ aio_context = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(aio_context);
+ nb_sns = bdrv_snapshot_list(bs, &sn_tab);
+ aio_context_release(aio_context);
+
+ for (i = 0; i < nb_sns; i++) {
+ if (bdrv_all_find_snapshot(sn_tab[i].name, &bs) == 0) {
+ if (sn_tab[i].icount != -1ULL
+ && sn_tab[i].icount <= icount
+ && (!nearest || nearest->icount < sn_tab[i].icount)) {
+ nearest = &sn_tab[i];
+ }
+ }
+ }
+ if (nearest) {
+ ret = g_strdup(nearest->name);
+ *snapshot_icount = nearest->icount;
+ }
+ g_free(sn_tab);
+
+fail:
+ return ret;
+}
+
+static void replay_seek(int64_t icount, QEMUTimerCB callback, Error **errp)
+{
+ char *snapshot = NULL;
+ int64_t snapshot_icount;
+
+ if (replay_mode != REPLAY_MODE_PLAY) {
+ error_setg(errp, "replay must be enabled to seek");
+ return;
+ }
+ if (!replay_snapshot) {
+ error_setg(errp, "snapshotting is disabled");
+ return;
+ }
+
+ snapshot = replay_find_nearest_snapshot(icount, &snapshot_icount);
+ if (snapshot) {
+ if (icount < replay_get_current_step()
+ || replay_get_current_step() < snapshot_icount) {
+ vm_stop(RUN_STATE_RESTORE_VM);
+ load_snapshot(snapshot, errp);
+ }
+ g_free(snapshot);
+ }
+ if (replay_get_current_step() <= icount) {
+ replay_break(icount, callback, NULL);
+ vm_start();
+ } else {
+ error_setg(errp, "cannot seek to the specified instruction count");
+ }
+}
+
+void qmp_replay_seek(int64_t icount, Error **errp)
+{
+ replay_seek(icount, replay_stop_vm, errp);
+}
+
+void hmp_replay_seek(Monitor *mon, const QDict *qdict)
+{
+ int64_t icount = qdict_get_try_int(qdict, "icount", -1LL);
+ Error *err = NULL;
+
+ qmp_replay_seek(icount, &err);
+ if (err) {
+ error_report_err(err);
+ error_free(err);
+ return;
+ }
+}
- [Qemu-devel] [PATCH v12 03/25] replay: disable default snapshot for record/replay, (continued)
- [Qemu-devel] [PATCH v12 03/25] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 04/25] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 05/25] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 06/25] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 07/25] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 08/25] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 09/25] replay: provide an accessor for rr filename, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 10/25] qapi: introduce replay.json for record/replay-related stuff, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 11/25] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 12/25] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 13/25] replay: implement replay-seek command,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v12 14/25] replay: refine replay-time module, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 15/25] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 16/25] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 18/25] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 17/25] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 19/25] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 20/25] replay: init rtc after enabling the replay, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 21/25] replay: document development rules, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 23/25] replay: fix replay shutdown, Pavel Dovgalyuk, 2019/02/05
- [Qemu-devel] [PATCH v12 22/25] util/qemu-timer: refactor deadline calculation for external timers, Pavel Dovgalyuk, 2019/02/05