[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] migration: implement bdrv_all_find_vmstate_bs
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 09/10] migration: implement bdrv_all_find_vmstate_bs helper |
Date: |
Tue, 10 Nov 2015 17:25:34 +0300 |
The patch also ensures proper locking for the operation.
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 | 15 +++++++++++++++
include/block/snapshot.h | 2 ++
migration/savevm.c | 19 ++++---------------
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/block/snapshot.c b/block/snapshot.c
index 6de53cb..addb7c9 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -470,3 +470,18 @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
*first_bad_bs = bs;
return err;
}
+
+BlockDriverState *bdrv_all_find_vmstate_bs(void)
+{
+ bool not_found = true;
+ BlockDriverState *bs = NULL;
+
+ while (not_found && (bs = bdrv_next(bs))) {
+ AioContext *ctx = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(ctx);
+ not_found = !bdrv_can_snapshot(bs);
+ aio_context_release(ctx);
+ }
+ return bs;
+}
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index 5f43c0b..a42a694 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -92,4 +92,6 @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
uint64_t vm_state_size,
BlockDriverState **first_bad_bs);
+BlockDriverState *bdrv_all_find_vmstate_bs(void);
+
#endif
diff --git a/migration/savevm.c b/migration/savevm.c
index f4da064..20c95b2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1237,17 +1237,6 @@ out:
return ret;
}
-static BlockDriverState *find_vmstate_bs(void)
-{
- BlockDriverState *bs = NULL;
- while ((bs = bdrv_next(bs))) {
- if (bdrv_can_snapshot(bs)) {
- return bs;
- }
- }
- return NULL;
-}
-
void hmp_savevm(Monitor *mon, const QDict *qdict)
{
BlockDriverState *bs, *bs1;
@@ -1276,8 +1265,8 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
return;
}
- bs = find_vmstate_bs();
- if (!bs) {
+ bs = bdrv_all_find_vmstate_bs();
+ if (bs == NULL) {
monitor_printf(mon, "No block device can accept snapshots\n");
return;
}
@@ -1386,7 +1375,7 @@ int load_vmstate(const char *name)
return ret;
}
- bs_vm_state = find_vmstate_bs();
+ bs_vm_state = bdrv_all_find_vmstate_bs();
if (!bs_vm_state) {
error_report("No block device supports snapshots");
return -ENOTSUP;
@@ -1455,7 +1444,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
int total;
int *available_snapshots;
- bs = find_vmstate_bs();
+ bs = bdrv_all_find_vmstate_bs();
if (!bs) {
monitor_printf(mon, "No available block device supports snapshots\n");
return;
--
2.5.0
- Re: [Qemu-devel] [PATCH 05/10] snapshot: create bdrv_all_find_snapshot helper, (continued)
- [Qemu-devel] [PATCH 07/10] snapshot: create bdrv_all_create_snapshot helper, Denis V. Lunev, 2015/11/10
- [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 <=
- 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