From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzNHM-0003Sv-C9 for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzNHL-00078X-II for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzNHL-00078Q-Cg for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:27 -0500 From: Juan Quintela Date: Thu, 19 Nov 2015 12:21:03 +0100 Message-Id: <1447932069-2772-9-git-send-email-quintela@redhat.com> In-Reply-To: <1447932069-2772-1-git-send-email-quintela@redhat.com> References: <1447932069-2772-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 08/14] migration: factor our snapshottability check in load_vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, "Denis V. Lunev" , Kevin Wolf , dgilbert@redhat.com, Stefan Hajnoczi From: "Denis V. Lunev" 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 Reviewed-by: Juan Quintela Reviewed-by: Fam Zheng CC: Stefan Hajnoczi CC: Kevin Wolf Tested-by: Greg Kurz Signed-off-by: Juan Quintela --- 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