From nobody Fri May 3 09:20:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509447567250559.5106910744457; Tue, 31 Oct 2017 03:59:27 -0700 (PDT) Received: from localhost ([::1]:44737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9UGP-0006ny-GU for importer@patchew.org; Tue, 31 Oct 2017 06:59:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9U5p-0005o2-Gr for qemu-devel@nongnu.org; Tue, 31 Oct 2017 06:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9U5o-0004B8-MZ for qemu-devel@nongnu.org; Tue, 31 Oct 2017 06:48:25 -0400 Received: from mail.ispras.ru ([83.149.199.45]:39892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9U5o-0004Ar-Ey for qemu-devel@nongnu.org; Tue, 31 Oct 2017 06:48:24 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id A08A854006A; Tue, 31 Oct 2017 13:48:23 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Tue, 31 Oct 2017 13:48:24 +0300 Message-ID: <20171031104824.3079.91614.stgit@pasha-VirtualBox> In-Reply-To: <20171031104741.3079.26584.stgit@pasha-VirtualBox> References: <20171031104741.3079.26584.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [RFCPATCH08/20] replay: make safe vmstop at record/replay X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dovgaluk@ispras.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 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); } =20 - bdrv_drain_all(); - replay_disable_events(); - ret =3D bdrv_flush_all(); + if (!replay_events_enabled()) { + bdrv_drain_all(); + ret =3D bdrv_flush_all(); + } =20 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; =20 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; } =20