mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replay: fix save/load vm for non-empty queue

Browse Source 
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 <pavel.dovgaluk@ispras.ru>
Message-Id: <20180227095214.1060.32939.stgit@pasha-VirtualBox>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
This commit is contained in:
Pavel Dovgalyuk 2018-02-27 12:52:14 +03:00 committed by Paolo Bonzini
parent 1652e0c30f
commit 377b21ccea
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sysemu/replay.h
View File

@ -166,5 +166,8 @@ void replay_audio_in(int *recorded, void *samples, int *wpos, int size);
/*! Called at the start of execution. /*! Called at the start of execution.
Loads or saves initial vmstate depending on execution mode. */ Loads or saves initial vmstate depending on execution mode. */
void replay_vmstate_init(void); 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 #endif

13
migration/savevm.c
View File

@ -54,6 +54,7 @@
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "io/channel-buffer.h" #include "io/channel-buffer.h"
#include "io/channel-file.h" #include "io/channel-file.h"
#include "sysemu/replay.h"
#ifndef ETH_P_RARP #ifndef ETH_P_RARP
#define ETH_P_RARP 0x8035 #define ETH_P_RARP 0x8035
@ -2197,6 +2198,12 @@ int save_snapshot(const char *name, Error **errp)
struct tm tm; struct tm tm;
AioContext *aio_context; 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)) { if (!bdrv_all_can_snapshot(&bs)) {
error_setg(errp, "Device '%s' is writable but does not support " error_setg(errp, "Device '%s' is writable but does not support "
"snapshots", bdrv_get_device_name(bs)); "snapshots", bdrv_get_device_name(bs));
@ -2388,6 +2395,12 @@ int load_snapshot(const char *name, Error **errp)
AioContext *aio_context; AioContext *aio_context;
MigrationIncomingState *mis = migration_incoming_get_current(); 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)) { if (!bdrv_all_can_snapshot(&bs)) {
error_setg(errp, error_setg(errp,
"Device '%s' is writable but does not support snapshots", "Device '%s' is writable but does not support snapshots",

6
replay/replay-snapshot.c
View File

@ -83,3 +83,9 @@ void replay_vmstate_init(void)
} }
} }
} }
bool replay_can_snapshot(void)
{
return replay_mode == REPLAY_MODE_NONE
|| !replay_has_events();
}