[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/14] migration: factor our snapshottability check i
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 08/14] migration: factor our snapshottability check in load_vmstate |
Date: |
Thu, 19 Nov 2015 12:21:03 +0100 |
From: "Denis V. Lunev" <address@hidden>
We should check that all inserted and not read-only images support
snapshotting. This could be made using already invented helper
bdrv_all_can_snapshot().
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
Tested-by: Greg Kurz <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/savevm.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 254e51d..2ecc1b3 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2051,6 +2051,12 @@ int load_vmstate(const char *name)
QEMUFile *f;
int ret;
+ if (!bdrv_all_can_snapshot(&bs)) {
+ error_report("Device '%s' is writable but does not support snapshots.",
+ bdrv_get_device_name(bs));
+ return -ENOTSUP;
+ }
+
bs_vm_state = find_vmstate_bs();
if (!bs_vm_state) {
error_report("No block device supports snapshots");
@@ -2071,15 +2077,8 @@ int load_vmstate(const char *name)
writable and check if the requested snapshot is available too. */
bs = NULL;
while ((bs = bdrv_next(bs))) {
-
- if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
- continue;
- }
-
if (!bdrv_can_snapshot(bs)) {
- error_report("Device '%s' is writable but does not support
snapshots.",
- bdrv_get_device_name(bs));
- return -ENOTSUP;
+ continue;
}
ret = bdrv_snapshot_find(bs, &sn, name);
--
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 <=
- [Qemu-devel] [PULL 06/14] snapshot: create bdrv_all_delete_snapshot helper, Juan Quintela, 2015/11/19
- [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