ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: fix inability to save VM after snapshot 

The following sequence of operations fails:
    virsh start vm
    virsh snapshot-create vm
    virshh save vm --file file
with the following error
    error: Failed to save domain vm to file
    error: internal error: unable to execute QEMU command 'migrate':
    There's a migration process in progress

The problem is that qemu_savevm_state() calls migrate_init() which sets
migration state to MIGRATION_STATUS_SETUP and never cleaned it up.
This patch do the job.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
CC: Juan Quintela <quintela@redhat.com>
CC: Amit Shah <amit.shah@redhat.com>
Message-Id: <1466003203-26263-1-git-send-email-den@openvz.org>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Denis V. Lunev 2016-06-15 18:06:43 +03:00 committed by Amit Shah
parent 023ad1a6e9
commit 6dcf66681a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/savevm.c
View File

@ -1150,10 +1150,12 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
.shared = 0 .shared = 0
}; };
MigrationState *ms = migrate_init(&params); MigrationState *ms = migrate_init(&params);
MigrationStatus status;
ms->to_dst_file = f; ms->to_dst_file = f;
if (migration_is_blocked(errp)) { if (migration_is_blocked(errp)) {
return -EINVAL; ret = -EINVAL;
goto done;
} }
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
@ -1176,6 +1178,14 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
if (ret != 0) { if (ret != 0) {
error_setg_errno(errp, -ret, "Error while writing VM state"); error_setg_errno(errp, -ret, "Error while writing VM state");
} }
done:
if (ret != 0) {
status = MIGRATION_STATUS_FAILED;
} else {
status = MIGRATION_STATUS_COMPLETED;
}
migrate_set_state(&ms->state, MIGRATION_STATUS_SETUP, status);
return ret; return ret;
} }