[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/14] snapshot: create bdrv_all_delete_snapshot help
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 06/14] snapshot: create bdrv_all_delete_snapshot helper |
Date: |
Thu, 19 Nov 2015 12:21:01 +0100 |
From: "Denis V. Lunev" <address@hidden>
to delete snapshots from all loaded block drivers.
The patch also ensures proper locking.
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
CC: Kevin Wolf <address@hidden>
Tested-by: Greg Kurz <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
block/snapshot.c | 22 ++++++++++++++++++++
include/block/snapshot.h | 2 ++
migration/savevm.c | 54 +++++++++---------------------------------------
3 files changed, 34 insertions(+), 44 deletions(-)
diff --git a/block/snapshot.c b/block/snapshot.c
index ed0422d..61a6ad1 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -381,3 +381,25 @@ bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs)
*first_bad_bs = bs;
return ok;
}
+
+int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
+ Error **err)
+{
+ int ret = 0;
+ BlockDriverState *bs = NULL;
+ QEMUSnapshotInfo sn1, *snapshot = &sn1;
+
+ while (ret == 0 && (bs = bdrv_next(bs))) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(ctx);
+ if (bdrv_can_snapshot(bs) &&
+ bdrv_snapshot_find(bs, snapshot, name) >= 0) {
+ ret = bdrv_snapshot_delete_by_id_or_name(bs, name, err);
+ }
+ aio_context_release(ctx);
+ }
+
+ *first_bad_bs = bs;
+ return ret;
+}
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index 9ddfd42..d02d2b1 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -82,5 +82,7 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
* when appropriate for appropriate block drivers */
bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs);
+int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bsd_bs,
+ Error **err);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 4646aa1..c52cbbe 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1916,35 +1916,6 @@ static BlockDriverState *find_vmstate_bs(void)
return NULL;
}
-/*
- * Deletes snapshots of a given name in all opened images.
- */
-static int del_existing_snapshots(Monitor *mon, const char *name)
-{
- BlockDriverState *bs;
- QEMUSnapshotInfo sn1, *snapshot = &sn1;
- Error *err = NULL;
-
- bs = NULL;
- while ((bs = bdrv_next(bs))) {
- if (bdrv_can_snapshot(bs) &&
- bdrv_snapshot_find(bs, snapshot, name) >= 0) {
- bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
- if (err) {
- monitor_printf(mon,
- "Error while deleting snapshot on device '%s':"
- " %s\n",
- bdrv_get_device_name(bs),
- error_get_pretty(err));
- error_free(err);
- return -1;
- }
- }
- }
-
- return 0;
-}
-
void hmp_savevm(Monitor *mon, const QDict *qdict)
{
BlockDriverState *bs, *bs1;
@@ -2002,7 +1973,11 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
}
/* Delete old snapshots of the same name */
- if (name && del_existing_snapshots(mon, name) < 0) {
+ if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) {
+ monitor_printf(mon,
+ "Error while deleting snapshot on device '%s': %s\n",
+ bdrv_get_device_name(bs1), error_get_pretty(local_err));
+ error_free(local_err);
goto the_end;
}
@@ -2162,20 +2137,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
return;
}
- bs = NULL;
- while ((bs = bdrv_next(bs))) {
- if (bdrv_can_snapshot(bs)) {
- err = NULL;
- bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
- if (err) {
- monitor_printf(mon,
- "Error while deleting snapshot on device '%s':"
- " %s\n",
- bdrv_get_device_name(bs),
- error_get_pretty(err));
- error_free(err);
- }
- }
+ if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {
+ monitor_printf(mon,
+ "Error while deleting snapshot on device '%s': %s\n",
+ bdrv_get_device_name(bs), error_get_pretty(err));
+ error_free(err);
}
}
--
2.5.0
- [Qemu-devel] [PULL 00/14] Migration pull request, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 02/14] migration: Dead assignment of current_time, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 01/14] Set last_sent_block, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 03/14] Unneeded NULL check, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 04/14] snapshot: create helper to test that block drivers supports snapshots, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 05/14] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 07/14] snapshot: create bdrv_all_goto_snapshot helper, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 08/14] migration: factor our snapshottability check in load_vmstate, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 06/14] snapshot: create bdrv_all_delete_snapshot helper,
Juan Quintela <=
- [Qemu-devel] [PULL 09/14] snapshot: create bdrv_all_find_snapshot helper, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 10/14] migration: drop find_vmstate_bs check in hmp_delvm, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 11/14] snapshot: create bdrv_all_create_snapshot helper, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 12/14] migration: reorder processing in hmp_savevm, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 14/14] migration: normalize locking in migration/savevm.c, Juan Quintela, 2015/11/19
- [Qemu-devel] [PULL 13/14] migration: implement bdrv_all_find_vmstate_bs helper, Juan Quintela, 2015/11/19
- Re: [Qemu-devel] [PULL 00/14] Migration pull request, Peter Maydell, 2015/11/19