From patchwork Wed Jun 15 15:06:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 9178759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28866604DB for ; Wed, 15 Jun 2016 15:07:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1595627DF9 for ; Wed, 15 Jun 2016 15:07:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0857226CFB; Wed, 15 Jun 2016 15:07:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D9F226CFB for ; Wed, 15 Jun 2016 15:07:18 +0000 (UTC) Received: from localhost ([::1]:42756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDCPV-00028I-Gu for patchwork-qemu-devel@patchwork.kernel.org; Wed, 15 Jun 2016 11:07:17 -0400 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 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u5FF6hh0017158; Wed, 15 Jun 2016 18:06:44 +0300 (MSK) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Date: Wed, 15 Jun 2016 18:06:43 +0300 Message-Id: <1466003203-26263-1-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 1/1] migration: fix inability to save VM after snapshot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amit Shah , den@openvz.org, Juan Quintela Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Dr. David Alan Gilbert --- 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; }