[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 09/11] migration: introduce a delete_snapshot wrapper
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v8 09/11] migration: introduce a delete_snapshot wrapper |
Date: |
Thu, 26 Nov 2020 17:35:19 +0000 |
Make snapshot deletion consistent with the snapshot save
and load commands by using a wrapper around the blockdev
layer. The main difference is that we get upfront validation
of the passed in device list (if any).
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
include/migration/snapshot.h | 13 +++++++++++++
migration/savevm.c | 14 ++++++++++++++
monitor/hmp-cmds.c | 2 +-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
index 3bdbef435b..e72083b117 100644
--- a/include/migration/snapshot.h
+++ b/include/migration/snapshot.h
@@ -48,4 +48,17 @@ bool load_snapshot(const char *name,
bool has_devices, strList *devices,
Error **errp);
+/**
+ * delete_snapshot: Delete a snapshot.
+ * @name: path to snapshot
+ * @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 delete_snapshot(const char *name,
+ bool has_devices, strList *devices,
+ Error **errp);
+
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 7c1c11e83c..4c620cdc7c 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -3033,6 +3033,20 @@ err_drain:
return false;
}
+bool delete_snapshot(const char *name, bool has_devices,
+ strList *devices, Error **errp)
+{
+ if (!bdrv_all_can_snapshot(has_devices, devices, errp)) {
+ return false;
+ }
+
+ if (bdrv_all_delete_snapshot(name, has_devices, devices, errp) < 0) {
+ return false;
+ }
+
+ return true;
+}
+
void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)
{
qemu_ram_set_idstr(mr->ram_block,
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index fb5dc7a4a7..2432a4abb6 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1150,7 +1150,7 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
Error *err = NULL;
const char *name = qdict_get_str(qdict, "name");
- bdrv_all_delete_snapshot(name, false, NULL, &err);
+ delete_snapshot(name, false, NULL, &err);
hmp_handle_error(mon, err);
}
--
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é, 2020/11/26
- [PATCH v8 09/11] migration: introduce a delete_snapshot wrapper,
Daniel P . Berrangé <=
- [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