From: Pavel Dovgalyuk <pavel.dovga...@ispras.ru> This patch disables bdrv flush/drain in record/replay mode. When block request is in the replay queue it cannot be processed with drain/flush until it is found in the log. Therefore vm should just stop leaving unfinished operations in the queue.
Signed-off-by: Pavel Dovgalyuk <pavel.dovga...@ispras.ru> --- cpus.c | 7 ++++--- migration/savevm.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cpus.c b/cpus.c index 114c29b..c728f3a 100644 --- a/cpus.c +++ b/cpus.c @@ -942,9 +942,10 @@ static int do_vm_stop(RunState state) qapi_event_send_stop(&error_abort); } - bdrv_drain_all(); - replay_disable_events(); - ret = bdrv_flush_all(); + if (!replay_events_enabled()) { + bdrv_drain_all(); + ret = bdrv_flush_all(); + } return ret; } diff --git a/migration/savevm.c b/migration/savevm.c index 20cebe1..41a13c0 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2143,8 +2143,8 @@ int save_snapshot(const char *name, Error **errp) AioContext *aio_context; if (!replay_can_snapshot()) { - monitor_printf(mon, "Record/replay does not allow making snapshot " - "right now. Try once more later.\n"); + error_report("Record/replay does not allow making snapshot " + "right now. Try once more later.\n"); return ret; }