diff options
| author | Denis V. Lunev <den@openvz.org> | 2015-11-19 09:42:09 +0300 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-11-19 11:50:00 +0100 |
| commit | 0b46160521ab72744da94988583a45d4d45e2986 (patch) | |
| tree | b435612501355f4197165219ea80b443671b3d62 /migration | |
| parent | a9085f9b5583ba7a02b412ba08f929555112c244 (diff) | |
migration: reorder processing in hmp_savevm
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 <den@openvz.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Tested-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/savevm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 80107e32b1..98f9a8c694 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) { |