[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 13/19] replay: flush rr queue before loading the
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v7 13/19] replay: flush rr queue before loading the vmstate |
Date: |
Wed, 10 Oct 2018 16:34:48 +0300 |
User-agent: |
StGit/0.17.1-dirty |
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 | 10 ++++------
replay/replay-internal.h | 2 --
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index b3f593f..cc5e9b0 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 bdf7136..57a297c 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2615,12 +2615,6 @@ int load_snapshot(const char *name, Error **errp)
AioContext *aio_context;
MigrationIncomingState *mis = migration_incoming_get_current();
- if (!replay_can_snapshot()) {
- error_report("Record/replay does not allow loading snapshot "
- "right now. Try once more later.");
- return -EINVAL;
- }
-
if (!bdrv_all_can_snapshot(&bs)) {
error_setg(errp,
"Device '%s' is writable but does not support snapshots",
@@ -2654,6 +2648,10 @@ 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 94b7e9b..e37b201 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 v7 02/19] replay: disable default snapshot for record/replay, (continued)
- [Qemu-devel] [PATCH v7 02/19] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 03/19] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 04/19] replay: don't drain/flush bdrv queue while RR is working, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 05/19] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 06/19] qcow2: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 07/19] migration: introduce icount field for snapshots, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 08/19] replay: provide and accessor for rr filename, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 09/19] replay: introduce info hmp/qmp command, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 11/19] replay: implement replay-seek command to proceed to the desired step, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 12/19] replay: refine replay-time module, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 13/19] replay: flush rr queue before loading the vmstate,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v7 10/19] replay: introduce breakpoint at the specified step, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 14/19] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 15/19] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 16/19] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 17/19] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 18/19] replay: init rtc after enabling the replay, Pavel Dovgalyuk, 2018/10/10
- [Qemu-devel] [PATCH v7 19/19] replay: document development rules, Pavel Dovgalyuk, 2018/10/10
- Re: [Qemu-devel] [PATCH v7 00/19] Fixing record/replay and adding reverse debugging, Aleksandr Bezzubikov, 2018/10/10