[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/11] snapshot: create bdrv_all_goto_snapshot helpe
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 04/11] snapshot: create bdrv_all_goto_snapshot helper |
Date: |
Wed, 4 Nov 2015 20:19:35 +0300 |
to switch to snapshot on 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 | 20 ++++++++++++++++++++
include/block/snapshot.h | 1 +
migration/savevm.c | 15 +++++----------
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/block/snapshot.c b/block/snapshot.c
index 1b4b846..639074f 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -406,3 +406,23 @@ int bdrv_all_delete_snapshot(const char *name,
BlockDriverState **first_bad_bs,
*first_bad_bs = bs;
return ret;
}
+
+
+int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs)
+{
+ int err = 0;
+ BlockDriverState *bs = NULL;
+
+ while ((bs = bdrv_next(bs)) && err == 0) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(ctx);
+ if (bdrv_can_snapshot(bs)) {
+ err = bdrv_snapshot_goto(bs, name);
+ }
+ aio_context_release(ctx);
+ }
+
+ *first_bad_bs = bs;
+ return err;
+}
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index 9c9750a..9c54b7c 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -85,5 +85,6 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs);
int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bsd_bs,
Error **err);
+int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bsd_bs);
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index 5a4a8c2..101dff5 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1425,16 +1425,11 @@ int load_vmstate(const char *name)
/* Flush all IO requests so they don't interfere with the new state. */
bdrv_drain_all();
- bs = NULL;
- while ((bs = bdrv_next(bs))) {
- if (bdrv_can_snapshot(bs)) {
- ret = bdrv_snapshot_goto(bs, name);
- if (ret < 0) {
- error_report("Error %d while activating snapshot '%s' on '%s'",
- ret, name, bdrv_get_device_name(bs));
- return ret;
- }
- }
+ ret = bdrv_all_goto_snapshot(name, &bs);
+ if (ret < 0) {
+ error_report("Error %d while activating snapshot '%s' on '%s'",
+ ret, name, bdrv_get_device_name(bs));
+ return ret;
}
/* restore the VM state */
--
2.5.0
- Re: [Qemu-devel] [PATCH 03/11] snapshot: create bdrv_all_delete_snapshot helper, (continued)
- [Qemu-devel] [PATCH 02/11] snapshot: return error code from bdrv_snapshot_delete_by_id_or_name, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 01/11] snapshot: create helper to test that block drivers supports snapshots, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 04/11] snapshot: create bdrv_all_goto_snapshot helper,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 07/11] migration: reorder processing in hmp_savevm, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 05/11] snapshot: create bdrv_all_find_snapshot helper, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 08/11] migration: implement bdrv_all_find_vmstate_bs and bdrv_unlock helpers, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 09/11] migration: add missed aio_context_acquire for state writing/reading, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 06/11] migration: drop find_vmstate_bs check in hmp_delvm, Denis V. Lunev, 2015/11/04
- [Qemu-devel] [PATCH 11/11] monitor: add missed aio_context_acquire into vm_completion call, Denis V. Lunev, 2015/11/04