[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v6 07/20] replay: fix save/load vm for non-empty
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [RFC PATCH v6 07/20] replay: fix save/load vm for non-empty queue |
Date: |
Wed, 07 Feb 2018 15:04:32 +0300 |
User-agent: |
StGit/0.17.1-dirty |
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 <address@hidden>
--
v2: fixed error_report calls
---
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 fa14d0e..b86d6bb 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -165,5 +165,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);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index b7908f6..99756e3 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -52,6 +52,7 @@
#include "qemu/cutils.h"
#include "io/channel-buffer.h"
#include "io/channel-file.h"
+#include "sysemu/replay.h"
#ifndef ETH_P_RARP
#define ETH_P_RARP 0x8035
@@ -2141,6 +2142,12 @@ int save_snapshot(const char *name, Error **errp)
struct tm tm;
AioContext *aio_context;
+ if (!replay_can_snapshot()) {
+ error_report("Record/replay does not allow making snapshot "
+ "right now. Try once more later.");
+ return ret;
+ }
+
if (!bdrv_all_can_snapshot(&bs)) {
error_setg(errp, "Device '%s' is writable but does not support "
"snapshots", bdrv_get_device_name(bs));
@@ -2331,6 +2338,12 @@ 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",
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index b2e1076..7075986 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -83,3 +83,9 @@ void replay_vmstate_init(void)
}
}
}
+
+bool replay_can_snapshot(void)
+{
+ return replay_mode == REPLAY_MODE_NONE
+ || !replay_has_events();
+}
- [Qemu-devel] [RFC PATCH v6 00/20] replay additions, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 01/20] cpu-exec: fix exception_index handling, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 02/20] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 03/20] blkreplay: create temporary overlay for underlaying devices, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 04/20] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 05/20] replay: fix processing async events, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 06/20] replay: fixed replay_enable_events, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 07/20] replay: fix save/load vm for non-empty queue,
Pavel Dovgalyuk <=
- [Qemu-devel] [RFC PATCH v6 08/20] replay: added replay log format description, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 09/20] replay: save prior value of the host clock, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 10/20] replay/replay.c: bump REPLAY_VERSION again, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 11/20] replay/replay-internal.c: track holding of replay_lock, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 12/20] replay: make locking visible outside replay code, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 13/20] replay: push replay_mutex_lock up the call tree, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 14/20] replay: don't destroy mutex at exit, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 15/20] replay: check return values of fwrite, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 16/20] replay: avoid recursive call of checkpoints, Pavel Dovgalyuk, 2018/02/07
- [Qemu-devel] [RFC PATCH v6 18/20] replay: don't process async events when warping the clock, Pavel Dovgalyuk, 2018/02/07