[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-4.1 15/24] replay: flush rr queue before loading
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH for-4.1 15/24] replay: flush rr queue before loading the vmstate |
Date: |
Mon, 22 Apr 2019 14:21:04 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Pavel Dovgalyuk <address@hidden>
Non-empty record/replay queue prevents saving and loading the VM state,
because it includes pending bottom halves and block coroutines.
But when the new VM state is loaded, we don't have to preserve the consistency
of the current state anymore. Therefore this patch just flushes the queue
allowing the coroutines to finish.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
---
include/sysemu/replay.h | 2 ++
migration/savevm.c | 6 ++++++
replay/replay-internal.h | 2 --
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 3fe14b5f57..d7e859d915 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -140,6 +140,8 @@ void replay_disable_events(void);
void replay_enable_events(void);
/*! Returns true when saving events is enabled */
bool replay_events_enabled(void);
+/* Flushes events queue */
+void replay_flush_events(void);
/*! Adds bottom half event to the queue */
void replay_bh_schedule_event(QEMUBH *bh);
/*! Adds input event to the queue */
diff --git a/migration/savevm.c b/migration/savevm.c
index 51ab224d25..2198d61b81 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2788,6 +2788,12 @@ int load_snapshot(const char *name, Error **errp)
return -EINVAL;
}
+ /*
+ * Flush the record/replay queue. Now the VM state is going
+ * to change. Therefore we don't need to preserve its consistency
+ */
+ replay_flush_events();
+
/* Flush all IO requests so they don't interfere with the new state. */
bdrv_drain_all_begin();
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index 8c15a41350..945802361b 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -146,8 +146,6 @@ void replay_read_next_clock(unsigned int kind);
void replay_init_events(void);
/*! Clears internal data structures for events handling */
void replay_finish_events(void);
-/*! Flushes events queue */
-void replay_flush_events(void);
/*! Returns true if there are any unsaved events in the queue */
bool replay_has_events(void);
/*! Saves events from queue into the file */
- [Qemu-devel] [PATCH for-4.1 05/24] replay: don't drain/flush bdrv queue while RR is working, (continued)
- [Qemu-devel] [PATCH for-4.1 05/24] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 06/24] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 07/24] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 08/24] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 09/24] replay: provide an accessor for rr filename, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 10/24] qapi: introduce replay.json for record/replay-related stuff, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 11/24] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 12/24] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 13/24] replay: implement replay-seek command, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 14/24] replay: refine replay-time module, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 15/24] replay: flush rr queue before loading the vmstate,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH for-4.1 16/24] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 17/24] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 18/24] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 19/24] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 20/24] replay: document development rules, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 21/24] util/qemu-timer: refactor deadline calculation for external timers, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 22/24] replay: fix replay shutdown, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 23/24] replay: rename step-related variables and functions, Pavel Dovgalyuk, 2019/04/22
- [Qemu-devel] [PATCH for-4.1 24/24] icount: clean up cpu_can_io before jumping to the next block, Pavel Dovgalyuk, 2019/04/22