From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9UOI-0004Hj-8s for qemu-devel@nongnu.org; Tue, 31 Oct 2017 07:07:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9UOC-0006at-Lh for qemu-devel@nongnu.org; Tue, 31 Oct 2017 07:07:30 -0400 Received: from mail.ispras.ru ([83.149.199.45]:42242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9UOC-0006ai-Dg for qemu-devel@nongnu.org; Tue, 31 Oct 2017 07:07:24 -0400 From: Pavel Dovgalyuk Date: Tue, 31 Oct 2017 14:07:24 +0300 Message-ID: <20171031110724.5836.57572.stgit@pasha-VirtualBox> In-Reply-To: <20171031110641.5836.43266.stgit@pasha-VirtualBox> References: <20171031110641.5836.43266.stgit@pasha-VirtualBox> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC PATCH 08/26] replay: make safe vmstop at record/replay List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dovgaluk@ispras.ru From: Pavel Dovgalyuk 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 --- 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; }