From nobody Sat Oct 25 19:42:13 2025 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493887750531753.5841633721016; Thu, 4 May 2017 01:49:10 -0700 (PDT) Received: from localhost ([::1]:40475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6CRf-0001aO-B2 for importer@patchew.org; Thu, 04 May 2017 04:49:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6CKw-0003j8-RZ for qemu-devel@nongnu.org; Thu, 04 May 2017 04:42:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6CKt-0006bE-Nv for qemu-devel@nongnu.org; Thu, 04 May 2017 04:42:10 -0400 Received: from mail.ispras.ru ([83.149.199.45]:42352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6CKt-0006al-Fi for qemu-devel@nongnu.org; Thu, 04 May 2017 04:42:07 -0400 Received: from [10.10.150.19] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 99EDC540080; Thu, 4 May 2017 11:42:06 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Thu, 04 May 2017 11:42:10 +0300 Message-ID: <20170504084210.7488.37561.stgit@PASHA-ISP> In-Reply-To: <20170504084135.7488.24715.stgit@PASHA-ISP> References: <20170504084135.7488.24715.stgit@PASHA-ISP> User-Agent: StGit/0.16 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] [PATCH v9 06/10] replay: fix save/load vm for non-empty queue 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: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, jasowang@redhat.com, mst@redhat.com, dovgaluk@ispras.ru, kraxel@redhat.com, pbonzini@redhat.com 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 does not allows saving/loading vmstate when replay events queue is not empty. There is no reliable way to save events queue, because it describes internal coroutine state. Therefore saving and loading operations should be deferred to another record/replay step. Signed-off-by: Pavel Dovgalyuk --- include/sysemu/replay.h | 3 +++ migration/savevm.c | 13 +++++++++++++ replay/replay-snapshot.c | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index f1c0712795..5c9db2a2ef 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -164,5 +164,8 @@ void replay_audio_in(int *recorded, void *samples, int = *wpos, int size); /*! Called at the start of execution. Loads or saves initial vmstate depending on execution mode. */ void replay_vmstate_init(void); +/*! Called to ensure that replay state is consistent and VM snapshot + can be created */ +bool replay_can_snapshot(void); =20 #endif diff --git a/migration/savevm.c b/migration/savevm.c index 03ae1bdeb4..358d22170d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -54,6 +54,7 @@ #include "qemu/cutils.h" #include "io/channel-buffer.h" #include "io/channel-file.h" +#include "sysemu/replay.h" =20 #ifndef ETH_P_RARP #define ETH_P_RARP 0x8035 @@ -2083,6 +2084,12 @@ int save_vmstate(Monitor *mon, const char *name) Error *local_err =3D NULL; AioContext *aio_context; =20 + if (!replay_can_snapshot()) { + monitor_printf(mon, "Record/replay does not allow making snapshot = right now. " + "Try stopping at another step.\n"); + return ret; + } + if (!bdrv_all_can_snapshot(&bs)) { monitor_printf(mon, "Device '%s' is writable but does not " "support snapshots.\n", bdrv_get_device_name(bs)); @@ -2244,6 +2251,12 @@ int load_vmstate(const char *name) AioContext *aio_context; MigrationIncomingState *mis =3D migration_incoming_get_current(); =20 + if (!replay_can_snapshot()) { + error_report("Record/replay does not allow loading snapshot right = now. " + "Try stopping at another step.\n"); + return -EINVAL; + } + if (!bdrv_all_can_snapshot(&bs)) { error_report("Device '%s' is writable but does not support snapsho= ts.", bdrv_get_device_name(bs)); diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 65e2d375c2..438d82ec33 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -76,3 +76,9 @@ void replay_vmstate_init(void) } } } + +bool replay_can_snapshot(void) +{ + return replay_mode =3D=3D REPLAY_MODE_NONE + || !replay_has_events(); +}