[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 08/10] migration: introduce a delete_snapshot wrapper
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v6 08/10] migration: introduce a delete_snapshot wrapper |
Date: |
Thu, 8 Oct 2020 16:49:59 +0100 |
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 | 4 +++-
migration/savevm.c | 14 ++++++++++++++
monitor/hmp-cmds.c | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
index b2c72e0a1b..f46f28745d 100644
--- a/include/migration/snapshot.h
+++ b/include/migration/snapshot.h
@@ -25,5 +25,7 @@ int load_snapshot(const char *name,
const char *vmstate,
bool has_devices, strList *devices,
Error **errp);
-
+int delete_snapshot(const char *name,
+ bool has_devices, strList *devices,
+ Error **errp);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 9cf18c87ed..bfbf84b9f2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2966,6 +2966,20 @@ err_drain:
return -1;
}
+int delete_snapshot(const char *name, bool has_devices,
+ strList *devices, Error **errp)
+{
+ if (!bdrv_all_can_snapshot(has_devices, devices, errp)) {
+ return -1;
+ }
+
+ if (bdrv_all_delete_snapshot(name, has_devices, devices, errp) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
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 96f7060e00..2f65fada29 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1143,7 +1143,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.26.2
- [PATCH v6 01/10] block: push error reporting into bdrv_all_*_snapshot functions, (continued)
- [PATCH v6 01/10] block: push error reporting into bdrv_all_*_snapshot functions, Daniel P . Berrangé, 2020/10/08
- [PATCH v6 05/10] block: rename and alter bdrv_all_find_snapshot semantics, Daniel P . Berrangé, 2020/10/08
- [PATCH v6 02/10] migration: stop returning errno from load_snapshot(), Daniel P . Berrangé, 2020/10/08
- [PATCH v6 06/10] migration: control whether snapshots are ovewritten, Daniel P . Berrangé, 2020/10/08
- [PATCH v6 07/10] migration: wire up support for snapshot device selection, Daniel P . Berrangé, 2020/10/08
- [PATCH v6 08/10] migration: introduce a delete_snapshot wrapper,
Daniel P . Berrangé <=
- [PATCH v6 09/10] iotests: add support for capturing and matching QMP events, Daniel P . Berrangé, 2020/10/08
- [PATCH v6 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2020/10/08
- Re: [PATCH v6 00/10] migration: bring improved savevm/loadvm/delvm to QMP, Daniel P . Berrangé, 2020/10/15