[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 08/11] migration: wire up support for snapshot device selectio
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v8 08/11] migration: wire up support for snapshot device selection |
Date: |
Thu, 26 Nov 2020 17:35:18 +0000 |
Modify load_snapshot/save_snapshot to accept the device list and vmstate
node name parameters previously added to the block layer.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
include/migration/snapshot.h | 18 ++++++++++++++++--
migration/savevm.c | 28 +++++++++++++++++-----------
monitor/hmp-cmds.c | 5 +++--
replay/replay-debugging.c | 4 ++--
replay/replay-snapshot.c | 5 +++--
softmmu/vl.c | 2 +-
6 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
index d8c22d343c..3bdbef435b 100644
--- a/include/migration/snapshot.h
+++ b/include/migration/snapshot.h
@@ -15,23 +15,37 @@
#ifndef QEMU_MIGRATION_SNAPSHOT_H
#define QEMU_MIGRATION_SNAPSHOT_H
+#include "qapi/qapi-builtin-types.h"
+
/**
* save_snapshot: Save an internal snapshot.
* @name: name of internal snapshot
* @overwrite: replace existing snapshot with @name
+ * @vmstate: blockdev node name to store VM state in
+ * @has_devices: whether to use explicit device list
+ * @devices: explicit device list to snapshot
* @errp: pointer to error object
* On success, return %true.
* On failure, store an error through @errp and return %false.
*/
-bool save_snapshot(const char *name, bool overwrite, Error **errp);
+bool save_snapshot(const char *name, bool overwrite,
+ const char *vmstate,
+ bool has_devices, strList *devices,
+ Error **errp);
/**
* load_snapshot: Load an internal snapshot.
* @name: name of internal snapshot
+ * @vmstate: blockdev node name to load VM state from
+ * @has_devices: whether to use explicit device list
+ * @devices: explicit device list to snapshot
* @errp: pointer to error object
* On success, return %true.
* On failure, store an error through @errp and return %false.
*/
-bool load_snapshot(const char *name, Error **errp);
+bool load_snapshot(const char *name,
+ const char *vmstate,
+ bool has_devices, strList *devices,
+ Error **errp);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 3ced05459d..7c1c11e83c 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -42,6 +42,8 @@
#include "postcopy-ram.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-migration.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-builtin-visit.h"
#include "qapi/qmp/qerror.h"
#include "qemu/error-report.h"
#include "sysemu/cpus.h"
@@ -2725,7 +2727,8 @@ int qemu_load_device_state(QEMUFile *f)
return 0;
}
-bool save_snapshot(const char *name, bool overwrite, Error **errp)
+bool save_snapshot(const char *name, bool overwrite, const char *vmstate,
+ bool has_devices, strList *devices, Error **errp)
{
BlockDriverState *bs;
QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;
@@ -2747,18 +2750,19 @@ bool save_snapshot(const char *name, bool overwrite,
Error **errp)
return false;
}
- if (!bdrv_all_can_snapshot(false, NULL, errp)) {
+ if (!bdrv_all_can_snapshot(has_devices, devices, errp)) {
return false;
}
/* Delete old snapshots of the same name */
if (name) {
if (overwrite) {
- if (bdrv_all_delete_snapshot(name, false, NULL, errp) < 0) {
+ if (bdrv_all_delete_snapshot(name, has_devices,
+ devices, errp) < 0) {
return false;
}
} else {
- ret2 = bdrv_all_has_snapshot(name, false, NULL, errp);
+ ret2 = bdrv_all_has_snapshot(name, has_devices, devices, errp);
if (ret2 < 0) {
return false;
}
@@ -2771,7 +2775,7 @@ bool save_snapshot(const char *name, bool overwrite,
Error **errp)
}
}
- bs = bdrv_all_find_vmstate_bs(NULL, false, NULL, errp);
+ bs = bdrv_all_find_vmstate_bs(vmstate, has_devices, devices, errp);
if (bs == NULL) {
return false;
}
@@ -2842,7 +2846,8 @@ bool save_snapshot(const char *name, bool overwrite,
Error **errp)
aio_context_release(aio_context);
aio_context = NULL;
- ret = bdrv_all_create_snapshot(sn, bs, vm_state_size, false, NULL, errp);
+ ret = bdrv_all_create_snapshot(sn, bs, vm_state_size,
+ has_devices, devices, errp);
if (ret < 0) {
goto the_end;
}
@@ -2944,7 +2949,8 @@ void qmp_xen_load_devices_state(const char *filename,
Error **errp)
migration_incoming_state_destroy();
}
-bool load_snapshot(const char *name, Error **errp)
+bool load_snapshot(const char *name, const char *vmstate,
+ bool has_devices, strList *devices, Error **errp)
{
BlockDriverState *bs_vm_state;
QEMUSnapshotInfo sn;
@@ -2953,10 +2959,10 @@ bool load_snapshot(const char *name, Error **errp)
AioContext *aio_context;
MigrationIncomingState *mis = migration_incoming_get_current();
- if (!bdrv_all_can_snapshot(false, NULL, errp)) {
+ if (!bdrv_all_can_snapshot(has_devices, devices, errp)) {
return false;
}
- ret = bdrv_all_has_snapshot(name, false, NULL, errp);
+ ret = bdrv_all_has_snapshot(name, has_devices, devices, errp);
if (ret < 0) {
return false;
}
@@ -2966,7 +2972,7 @@ bool load_snapshot(const char *name, Error **errp)
return -1;
}
- bs_vm_state = bdrv_all_find_vmstate_bs(NULL, false, NULL, errp);
+ bs_vm_state = bdrv_all_find_vmstate_bs(vmstate, has_devices, devices,
errp);
if (!bs_vm_state) {
return false;
}
@@ -2993,7 +2999,7 @@ bool load_snapshot(const char *name, Error **errp)
/* Flush all IO requests so they don't interfere with the new state. */
bdrv_drain_all_begin();
- ret = bdrv_all_goto_snapshot(name, false, NULL, errp);
+ ret = bdrv_all_goto_snapshot(name, has_devices, devices, errp);
if (ret < 0) {
goto err_drain;
}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 4e1e775007..fb5dc7a4a7 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1130,7 +1130,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)
vm_stop(RUN_STATE_RESTORE_VM);
- if (!load_snapshot(name, &err) && saved_vm_running) {
+ if (!load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) {
vm_start();
}
hmp_handle_error(mon, err);
@@ -1140,7 +1140,8 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
- save_snapshot(qdict_get_try_str(qdict, "name"), true, &err);
+ save_snapshot(qdict_get_try_str(qdict, "name"),
+ true, NULL, false, NULL, &err);
hmp_handle_error(mon, err);
}
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
index 8847b2e218..a364f1669b 100644
--- a/replay/replay-debugging.c
+++ b/replay/replay-debugging.c
@@ -197,7 +197,7 @@ static void replay_seek(int64_t icount, QEMUTimerCB
callback, Error **errp)
if (icount < replay_get_current_icount()
|| replay_get_current_icount() < snapshot_icount) {
vm_stop(RUN_STATE_RESTORE_VM);
- load_snapshot(snapshot, errp);
+ load_snapshot(snapshot, NULL, false, NULL, errp);
}
g_free(snapshot);
}
@@ -328,7 +328,7 @@ void replay_gdb_attached(void)
*/
if (replay_mode == REPLAY_MODE_PLAY
&& !replay_snapshot) {
- if (!save_snapshot("start_debugging", true, NULL)) {
+ if (!save_snapshot("start_debugging", true, NULL, false, NULL, NULL)) {
/* Can't create the snapshot. Continue conventional debugging. */
}
}
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index 31c5a8702b..e8767a1937 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -77,13 +77,14 @@ void replay_vmstate_init(void)
if (replay_snapshot) {
if (replay_mode == REPLAY_MODE_RECORD) {
- if (!save_snapshot(replay_snapshot, true, &err)) {
+ if (!save_snapshot(replay_snapshot,
+ true, NULL, false, NULL, &err)) {
error_report_err(err);
error_report("Could not create snapshot for icount record");
exit(1);
}
} else if (replay_mode == REPLAY_MODE_PLAY) {
- if (!load_snapshot(replay_snapshot, &err)) {
+ if (!load_snapshot(replay_snapshot, NULL, false, NULL, &err)) {
error_report_err(err);
error_report("Could not load snapshot for icount replay");
exit(1);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 872ff8bdbc..f00b2765af 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4473,7 +4473,7 @@ void qemu_init(int argc, char **argv, char **envp)
register_global_state();
if (loadvm) {
Error *local_err = NULL;
- if (!load_snapshot(loadvm, &local_err)) {
+ if (!load_snapshot(loadvm, NULL, false, NULL, &local_err)) {
error_report_err(local_err);
autostart = 0;
exit(1);
--
2.28.0
- [PATCH v8 00/11] migration: bring improved savevm/loadvm/delvm to QMP, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 01/11] block: push error reporting into bdrv_all_*_snapshot functions, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 02/11] migration: Make save_snapshot() return bool, not 0/-1, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 03/11] migration: stop returning errno from load_snapshot(), Daniel P . Berrangé, 2020/11/26
- [PATCH v8 04/11] block: add ability to specify list of blockdevs during snapshot, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 05/11] block: allow specifying name of block device for vmstate storage, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 06/11] block: rename and alter bdrv_all_find_snapshot semantics, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 07/11] migration: control whether snapshots are ovewritten, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 08/11] migration: wire up support for snapshot device selection,
Daniel P . Berrangé <=
- [PATCH v8 09/11] migration: introduce a delete_snapshot wrapper, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 10/11] iotests: add support for capturing and matching QMP events, Daniel P . Berrangé, 2020/11/26
- [PATCH v8 11/11] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2020/11/26