From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43126)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dgilbert@redhat.com>) id 1bDb19-0005nw-DC
	for qemu-devel@nongnu.org; Thu, 16 Jun 2016 13:23:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <dgilbert@redhat.com>) id 1bDb14-0000mQ-A1
	for qemu-devel@nongnu.org; Thu, 16 Jun 2016 13:23:46 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42793)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <dgilbert@redhat.com>) id 1bDb14-0000mM-42
	for qemu-devel@nongnu.org; Thu, 16 Jun 2016 13:23:42 -0400
Date: Thu, 16 Jun 2016 18:23:38 +0100
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Message-ID: <20160616172337.GE2249@work-vm>
References: <1466003203-26263-1-git-send-email-den@openvz.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1466003203-26263-1-git-send-email-den@openvz.org>
Subject: Re: [Qemu-devel] [PATCH 1/1] migration: fix inability to save VM
 after snapshot
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Denis V. Lunev" <den@openvz.org>
Cc: qemu-devel@nongnu.org, Amit Shah <amit.shah@redhat.com>, Juan Quintela <quintela@redhat.com>

* Denis V. Lunev (den@openvz.org) wrote:
> 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>
> CC: Juan Quintela <quintela@redhat.com>
> CC: Amit Shah <amit.shah@redhat.com>


Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  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(&params);
> +    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
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK