From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzNHU-0003gY-88 for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzNHT-0007Bh-FF for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzNHT-0007BN-4U for qemu-devel@nongnu.org; Thu, 19 Nov 2015 06:21:35 -0500 From: Juan Quintela Date: Thu, 19 Nov 2015 12:21:07 +0100 Message-Id: <1447932069-2772-13-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 12/14] migration: reorder processing in hmp_savevm 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" , dgilbert@redhat.com From: "Denis V. Lunev" State deletion can be performed on running VM which reduces VM downtime This approach looks a bit more natural. Signed-off-by: Denis V. Lunev Reviewed-by: Stefan Hajnoczi Reviewed-by: Fam Zheng Reviewed-by: Juan Quintela Tested-by: Greg Kurz Signed-off-by: Juan Quintela --- migration/savevm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 80107e3..98f9a8c 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1935,6 +1935,15 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) return; } + /* Delete old snapshots of the same name */ + if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) { + monitor_printf(mon, + "Error while deleting snapshot on device '%s': %s\n", + bdrv_get_device_name(bs1), error_get_pretty(local_err)); + error_free(local_err); + return; + } + bs = find_vmstate_bs(); if (!bs) { monitor_printf(mon, "No block device can accept snapshots\n"); @@ -1972,15 +1981,6 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) strftime(sn->name, sizeof(sn->name), "vm-%Y%m%d%H%M%S", &tm); } - /* Delete old snapshots of the same name */ - if (name && bdrv_all_delete_snapshot(name, &bs1, &local_err) < 0) { - monitor_printf(mon, - "Error while deleting snapshot on device '%s': %s\n", - bdrv_get_device_name(bs1), error_get_pretty(local_err)); - error_free(local_err); - goto the_end; - } - /* save the VM state */ f = qemu_fopen_bdrv(bs, 1); if (!f) { -- 2.5.0