From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDCPD-000287-B2 for qemu-devel@nongnu.org; Wed, 15 Jun 2016 11:07:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDCP8-0008Hn-7G for qemu-devel@nongnu.org; Wed, 15 Jun 2016 11:06:58 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:12695 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDCP7-0008Fl-Og for qemu-devel@nongnu.org; Wed, 15 Jun 2016 11:06:54 -0400 From: "Denis V. Lunev" Date: Wed, 15 Jun 2016 18:06:43 +0300 Message-Id: <1466003203-26263-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 1/1] migration: fix inability to save VM after snapshot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: den@openvz.org, Juan Quintela , Amit Shah 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 CC: Juan Quintela CC: Amit Shah --- migration/savevm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6c21231..749df1e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1149,10 +1149,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(); @@ -1175,6 +1177,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; } -- 2.5.0