From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com,
crosthwaite.peter@gmail.com, boost.lists@gmail.com,
quintela@redhat.com, ciro.santilli@gmail.com,
jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com,
armbru@redhat.com, maria.klimushenkova@ispras.ru,
dovgaluk@ispras.ru, kraxel@redhat.com, pavel.dovgaluk@ispras.ru,
thomas.dullien@googlemail.com, pbonzini@redhat.com,
mreitz@redhat.com, alex.bennee@linaro.org, dgilbert@redhat.com,
rth@twiddle.net
Subject: [Qemu-devel] [PATCH v5 15/24] replay: flush rr queue before loading the vmstate
Date: Wed, 25 Jul 2018 15:16:15 +0300 [thread overview]
Message-ID: <20180725121614.12867.73655.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20180725121311.12867.21729.stgit@pasha-VirtualBox>
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 <Pavel.Dovgaluk@ispras.ru>
---
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 98d709c..84a1ec5 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -132,6 +132,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 6be4f80..834dd25 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2607,12 +2607,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",
@@ -2646,6 +2640,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 a2221e5..08ef2ec 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 */
next prev parent reply other threads:[~2018-07-25 12:16 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 12:13 [Qemu-devel] [PATCH v5 00/24] Fixing record/replay and adding reverse debugging Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 01/24] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 02/24] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 03/24] replay: update docs for record/replay with block devices Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 04/24] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 05/24] replay: finish record/replay before closing the disks Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 06/24] qcow2: introduce icount field for snapshots Pavel Dovgalyuk
2018-07-25 12:13 ` [Qemu-devel] [PATCH v5 07/24] migration: " Pavel Dovgalyuk
2018-07-25 12:14 ` [Qemu-devel] [PATCH v5 08/24] replay: introduce info hmp/qmp command Pavel Dovgalyuk
2018-07-25 14:56 ` Dr. David Alan Gilbert
2018-07-31 6:54 ` Pavel Dovgalyuk
2018-07-25 12:14 ` [Qemu-devel] [PATCH v5 09/24] replay: introduce breakpoint at the specified step Pavel Dovgalyuk
2018-07-25 12:14 ` [Qemu-devel] [PATCH v5 10/24] replay: implement replay-seek command to proceed to the desired step Pavel Dovgalyuk
2018-07-25 12:14 ` [Qemu-devel] [PATCH v5 11/24] replay: flush events when exiting Pavel Dovgalyuk
2018-07-25 12:15 ` [Qemu-devel] [PATCH v5 12/24] timer: remove replay clock probe in deadline calculation Pavel Dovgalyuk
2018-07-25 12:15 ` [Qemu-devel] [PATCH v5 13/24] replay: refine replay-time module Pavel Dovgalyuk
2018-07-25 12:15 ` [Qemu-devel] [PATCH v5 14/24] translator: fix breakpoint processing Pavel Dovgalyuk
2018-07-25 12:16 ` Pavel Dovgalyuk [this message]
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 16/24] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 17/24] gdbstub: add reverse continue " Pavel Dovgalyuk
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 18/24] replay: describe reverse debugging in docs/replay.txt Pavel Dovgalyuk
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 19/24] replay: allow loading any snapshots before recording Pavel Dovgalyuk
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 20/24] ps2: prevent changing irq state on save and load Pavel Dovgalyuk
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 21/24] replay: wake up vCPU when replaying Pavel Dovgalyuk
2018-07-25 12:16 ` [Qemu-devel] [PATCH v5 22/24] replay: replay BH for IDE trim operation Pavel Dovgalyuk
2018-07-25 12:29 ` Paolo Bonzini
2018-07-25 12:17 ` [Qemu-devel] [PATCH v5 23/24] replay: add BH oneshot event for block layer Pavel Dovgalyuk
2018-07-26 15:36 ` Alex Bennée
2018-07-26 17:20 ` Alex Bennée
2018-07-27 4:52 ` Pavel Dovgalyuk
2018-07-27 16:44 ` Alex Bennée
2018-08-02 5:50 ` Pavel Dovgalyuk
2018-07-26 17:17 ` Alex Bennée
2018-07-31 7:00 ` Pavel Dovgalyuk
2018-08-01 16:54 ` Paolo Bonzini
2018-07-25 12:17 ` [Qemu-devel] [PATCH v5 24/24] slirp: fix ipv6 timers Pavel Dovgalyuk
2018-07-25 13:44 ` Samuel Thibault
2018-07-26 7:08 ` Pavel Dovgalyuk
2018-07-26 7:35 ` Samuel Thibault
2018-07-26 7:37 ` Pavel Dovgalyuk
2018-07-26 7:40 ` Samuel Thibault
2018-07-26 8:07 ` Samuel Thibault
2018-07-26 8:37 ` Pavel Dovgalyuk
2018-07-26 9:15 ` Samuel Thibault
2018-07-31 6:58 ` Pavel Dovgalyuk
2018-08-01 19:22 ` Samuel Thibault
2018-07-25 14:15 ` [Qemu-devel] [PATCH v5 00/24] Fixing record/replay and adding reverse debugging no-reply
2018-08-07 23:13 ` Ciro Santilli
2018-09-12 8:14 ` dovgaluk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180725121614.12867.73655.stgit@pasha-VirtualBox \
--to=pavel.dovgaluk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=boost.lists@gmail.com \
--cc=ciro.santilli@gmail.com \
--cc=crosthwaite.peter@gmail.com \
--cc=dgilbert@redhat.com \
--cc=dovgaluk@ispras.ru \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=maria.klimushenkova@ispras.ru \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rth@twiddle.net \
--cc=thomas.dullien@googlemail.com \
--cc=war2jordan@live.com \
--cc=zuban32s@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).