[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 19/24] replay: allow loading any snapshots before
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v5 19/24] replay: allow loading any snapshots before recording |
Date: |
Wed, 25 Jul 2018 15:16:38 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This patch enables using -loadvm in recording mode to allow starting
the execution recording from any of the available snapshots.
It also fixes loading of the record/replay state, therefore snapshots
created in replay mode may also be used for starting the new recording.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
replay/replay-snapshot.c | 17 ++++++++++++-----
vl.c | 7 ++++---
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index 2ab85cf..16bacc9 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -33,11 +33,18 @@ static int replay_pre_save(void *opaque)
static int replay_post_load(void *opaque, int version_id)
{
ReplayState *state = opaque;
- fseek(replay_file, state->file_offset, SEEK_SET);
- qemu_clock_set_last(QEMU_CLOCK_HOST, state->host_clock_last);
- /* If this was a vmstate, saved in recording mode,
- we need to initialize replay data fields. */
- replay_fetch_data_kind();
+ if (replay_mode == REPLAY_MODE_PLAY) {
+ fseek(replay_file, state->file_offset, SEEK_SET);
+ qemu_clock_set_last(QEMU_CLOCK_HOST, state->host_clock_last);
+ /* If this was a vmstate, saved in recording mode,
+ we need to initialize replay data fields. */
+ replay_fetch_data_kind();
+ } else if (replay_mode == REPLAY_MODE_RECORD) {
+ /* This is only useful for loading the initial state.
+ Therefore reset all the counters. */
+ state->instructions_count = 0;
+ state->block_request_id = 0;
+ }
return 0;
}
diff --git a/vl.c b/vl.c
index e86d295..59b018d 100644
--- a/vl.c
+++ b/vl.c
@@ -4616,15 +4616,16 @@ int main(int argc, char **argv, char **envp)
replay_checkpoint(CHECKPOINT_RESET);
qemu_system_reset(SHUTDOWN_CAUSE_NONE);
register_global_state();
- if (replay_mode != REPLAY_MODE_NONE) {
- replay_vmstate_init();
- } else if (loadvm) {
+ if (loadvm) {
Error *local_err = NULL;
if (load_snapshot(loadvm, &local_err) < 0) {
error_report_err(local_err);
autostart = 0;
}
}
+ if (replay_mode != REPLAY_MODE_NONE) {
+ replay_vmstate_init();
+ }
qdev_prop_check_globals();
if (vmstate_dump_file) {
- [Qemu-devel] [PATCH v5 09/24] replay: introduce breakpoint at the specified step, (continued)
- [Qemu-devel] [PATCH v5 09/24] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 10/24] replay: implement replay-seek command to proceed to the desired step, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 11/24] replay: flush events when exiting, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 12/24] timer: remove replay clock probe in deadline calculation, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 13/24] replay: refine replay-time module, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 14/24] translator: fix breakpoint processing, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 15/24] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 16/24] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 17/24] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 18/24] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 19/24] replay: allow loading any snapshots before recording,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v5 20/24] ps2: prevent changing irq state on save and load, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 21/24] replay: wake up vCPU when replaying, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 22/24] replay: replay BH for IDE trim operation, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 23/24] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2018/07/25
- Re: [Qemu-devel] [PATCH v5 23/24] replay: add BH oneshot event for block layer, Alex Bennée, 2018/07/26