From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52482)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Vovxh-00060P-Rs
	for qemu-devel@nongnu.org; Fri, 06 Dec 2013 09:01:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Vovxc-0006R0-V2
	for qemu-devel@nongnu.org; Fri, 06 Dec 2013 09:00:57 -0500
Received: from mx1.redhat.com ([209.132.183.28]:10273)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Vovxc-0006Ql-HQ
	for qemu-devel@nongnu.org; Fri, 06 Dec 2013 09:00:52 -0500
Date: Fri, 6 Dec 2013 09:00:49 -0500
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20131206090049.6404ddec@redhat.com>
In-Reply-To: <52A1C7CB02000062000436B1@soto.provo.novell.com>
References: <52A1C7CB02000062000436B1@soto.provo.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] Fix incorrect state information for
 migrate_cancel
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: Lin Ma <lma@suse.com>
Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com

On Thu, 05 Dec 2013 18:49:15 -0700
"Lin Ma" <lma@suse.com> wrote:

> In qemu-1.4.x, When performing migrate_cancel on hmp, Sometimes
> s->state is incorrrectly saved to MIG_STATE_ERROR instead of
> MIG_STATE_CANCELLED.
> 
> If the migrate_fd_cancel in main thread is scheduled to run before
> the thread buffered_file_thread calls migrate_fd_put_buffer, The
> s->state will be modified to MIG_STATE_CANCELLED by main thread,
> Then the migrate_fd_put_buffer in thread buffered_file_thread will
> return -EIO if s->state != MIG_STATE_ACTIVE, This incorrect return
> value trigged migrate_fd_error to set s->state = MIG_STATE_ERROR.
> 
> This patch fixes the issue in qemu-1.4.x.

Is qemu 1.4 still maintained?

> 
> Signed-off-by: Lin Ma <lma@suse.com>
> ---
>  migration.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration.c b/migration.c
> index 98c7696..0ac4608 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -751,7 +751,7 @@ static void *buffered_file_thread(void *opaque)
>      }
>  
>  out:
> -    if (ret < 0) {
> +    if (ret < 0 && !s->complete) {
>          migrate_fd_error(s);
>      }
>      g_free(s->buffer);