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>
This commit is contained in:
parent
a9085f9b55
commit
0b46160521
|
@ -1935,6 +1935,15 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)
|
||||||
return;
|
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();
|
bs = find_vmstate_bs();
|
||||||
if (!bs) {
|
if (!bs) {
|
||||||
monitor_printf(mon, "No block device can accept snapshots\n");
|
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);
|
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 */
|
/* save the VM state */
|
||||||
f = qemu_fopen_bdrv(bs, 1);
|
f = qemu_fopen_bdrv(bs, 1);
|
||||||
if (!f) {
|
if (!f) {
|
||||||
|
|
Loading…
Reference in a new issue