[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] snapshot: create bdrv_all_create_snapshot hel
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 07/10] snapshot: create bdrv_all_create_snapshot helper |
Date: |
Tue, 10 Nov 2015 17:25:32 +0300 |
to create snapshot for all loaded block drivers.
The patch also ensures proper locking.
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Juan Quintela <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
---
block/snapshot.c | 26 ++++++++++++++++++++++++++
include/block/snapshot.h | 4 ++++
migration/savevm.c | 17 ++++-------------
3 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/block/snapshot.c b/block/snapshot.c
index 97dc315..6de53cb 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -444,3 +444,29 @@ int bdrv_all_find_snapshot(const char *name, bool
read_only,
*first_bad_bs = bs;
return err;
}
+
+int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
+ BlockDriverState *vm_state_bs,
+ uint64_t vm_state_size,
+ BlockDriverState **first_bad_bs)
+{
+ int err = 0;
+ BlockDriverState *bs = NULL;
+
+ while (err == 0 && (bs = bdrv_next(bs))) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(ctx);
+ if (bs == vm_state_bs) {
+ sn->vm_state_size = vm_state_size;
+ err = bdrv_snapshot_create(bs, sn);
+ } else if (bdrv_can_snapshot(bs)) {
+ sn->vm_state_size = 0;
+ err = bdrv_snapshot_create(bs, sn);
+ }
+ aio_context_release(ctx);
+ }
+
+ *first_bad_bs = bs;
+ return err;
+}
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index 0fae32b..5f43c0b 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -87,5 +87,9 @@ int bdrv_all_delete_snapshot(const char *name,
BlockDriverState **first_bsd_bs,
int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bsd_bs);
int bdrv_all_find_snapshot(const char *name, bool read_only,
BlockDriverState **first_bad_bs);
+int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
+ BlockDriverState *vm_state_bs,
+ uint64_t vm_state_size,
+ BlockDriverState **first_bad_bs);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 4c652f3..c2d677d 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1328,19 +1328,10 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
goto the_end;
}
- /* create the snapshots */
-
- bs1 = NULL;
- while ((bs1 = bdrv_next(bs1))) {
- if (bdrv_can_snapshot(bs1)) {
- /* Write VM state size only to the image that contains the state */
- sn->vm_state_size = (bs == bs1 ? vm_state_size : 0);
- ret = bdrv_snapshot_create(bs1, sn);
- if (ret < 0) {
- monitor_printf(mon, "Error while creating snapshot on '%s'\n",
- bdrv_get_device_name(bs1));
- }
- }
+ ret = bdrv_all_create_snapshot(sn, bs, vm_state_size, &bs);
+ if (ret < 0) {
+ monitor_printf(mon, "Error while creating snapshot on '%s'\n",
+ bdrv_get_device_name(bs));
}
the_end:
--
2.5.0
- [Qemu-devel] [PATCH for 2.5 v7 0/10] dataplane snapshot fixes, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 04/10] snapshot: create bdrv_all_goto_snapshot helper, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 05/10] snapshot: create bdrv_all_find_snapshot helper, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 07/10] snapshot: create bdrv_all_create_snapshot helper,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 08/10] migration: reorder processing in hmp_savevm, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 03/10] snapshot: create bdrv_all_delete_snapshot helper, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 01/10] snapshot: create helper to test that block drivers supports snapshots, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 10/10] migration: normalize locking in migration/savevm.c, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 06/10] migration: drop find_vmstate_bs check in hmp_delvm, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 02/10] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name, Denis V. Lunev, 2015/11/10
- [Qemu-devel] [PATCH 09/10] migration: implement bdrv_all_find_vmstate_bs helper, Denis V. Lunev, 2015/11/10
- Re: [Qemu-devel] [PATCH for 2.5 v7 0/10] dataplane snapshot fixes, Fam Zheng, 2015/11/12
- Re: [Qemu-devel] [PATCH for 2.5 v7 0/10] dataplane snapshot fixes, Stefan Hajnoczi, 2015/11/16