diff options
| author | Denis V. Lunev <den@openvz.org> | 2016-06-15 18:06:43 +0300 |
|---|---|---|
| committer | Amit Shah <amit.shah@redhat.com> | 2016-06-17 18:23:57 +0530 |
| commit | 6dcf66681aea2a371ddd63770bf80615652f5c94 (patch) | |
| tree | 2ad9d0aee91ac83236860493346b282e03105380 | |
| parent | 023ad1a6e9296470d8fd81db3bf0379057fc8994 (diff) | |
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>
| -rw-r--r-- | migration/savevm.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 6da084c2cf..38b85ee77b 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1150,10 +1150,12 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) .shared = 0 }; MigrationState *ms = migrate_init(¶ms); + MigrationStatus status; ms->to_dst_file = f; if (migration_is_blocked(errp)) { - return -EINVAL; + ret = -EINVAL; + goto done; } qemu_mutex_unlock_iothread(); @@ -1176,6 +1178,14 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) if (ret != 0) { 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; } |