aboutsummaryrefslogtreecommitdiff
path: root/migration/savevm.c
diff options
context:
space:
mode:
Diffstat (limited to 'migration/savevm.c')
-rw-r--r--migration/savevm.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/migration/savevm.c b/migration/savevm.c
index 192f2d82cd..b7908f62be 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2242,13 +2242,20 @@ int save_snapshot(const char *name, Error **errp)
return ret;
}
-void qmp_xen_save_devices_state(const char *filename, Error **errp)
+void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live,
+ Error **errp)
{
QEMUFile *f;
QIOChannelFile *ioc;
int saved_vm_running;
int ret;
+ if (!has_live) {
+ /* live default to true so old version of Xen tool stack can have a
+ * successfull live migration */
+ live = true;
+ }
+
saved_vm_running = runstate_is_running();
vm_stop(RUN_STATE_SAVE_VM);
global_state_store_running();
@@ -2263,6 +2270,20 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp)
qemu_fclose(f);
if (ret < 0) {
error_setg(errp, QERR_IO_ERROR);
+ } else {
+ /* libxl calls the QMP command "stop" before calling
+ * "xen-save-devices-state" and in case of migration failure, libxl
+ * would call "cont".
+ * So call bdrv_inactivate_all (release locks) here to let the other
+ * side of the migration take controle of the images.
+ */
+ if (live && !saved_vm_running) {
+ ret = bdrv_inactivate_all();
+ if (ret) {
+ error_setg(errp, "%s: bdrv_inactivate_all() failed (%d)",
+ __func__, ret);
+ }
+ }
}
the_end: