From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=53845 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OZ50A-0001AJ-LL
	for qemu-devel@nongnu.org; Wed, 14 Jul 2010 12:40:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <lcapitulino@redhat.com>) id 1OZ509-0006bl-Et
	for qemu-devel@nongnu.org; Wed, 14 Jul 2010 12:40:06 -0400
Received: from mx1.redhat.com ([209.132.183.28]:20881)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <lcapitulino@redhat.com>) id 1OZ509-0006bD-7L
	for qemu-devel@nongnu.org; Wed, 14 Jul 2010 12:40:05 -0400
Date: Wed, 14 Jul 2010 13:39:46 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20100714133946.2187acde@redhat.com>
In-Reply-To: <20100714000133.GA10547@amt.cnet>
References: <20100707180411.GA17569@amt.cnet> <20100709181851.GB7444@amt.cnet>
	<20100712223339.4b53ed36@redhat.com>
	<20100713173022.GA32561@amt.cnet>
	<20100713193539.56a2522b@redhat.com>
	<20100714000133.GA10547@amt.cnet>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] set proper migration status on ->write
	error (v5)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Marcelo Tosatti <mtosatti@redhat.com>
Cc: qemu-devel@nongnu.org, aurelien@aurel32.net, Juan Quintela <quintela@redhat.com>

On Tue, 13 Jul 2010 21:01:33 -0300
Marcelo Tosatti <mtosatti@redhat.com> wrote:

> 
> If ->write fails, declare migration status as MIG_STATE_ERROR.
> 
> Also, in buffered_file.c, ->close the object in case of an
> error.
> 
> Fixes "migrate -d "exec:dd of=file", where dd fails to open file.
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Looks good now, I guess it's good for stable too, isn't it?

Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

> 
> diff --git a/buffered_file.c b/buffered_file.c
> index 54dc6c2..be147d6 100644
> --- a/buffered_file.c
> +++ b/buffered_file.c
> @@ -222,8 +222,10 @@ static void buffered_rate_tick(void *opaque)
>  {
>      QEMUFileBuffered *s = opaque;
>  
> -    if (s->has_error)
> +    if (s->has_error) {
> +        buffered_close(s);
>          return;
> +    }
>  
>      qemu_mod_timer(s->timer, qemu_get_clock(rt_clock) + 100);
>  
> diff --git a/migration.c b/migration.c
> index b49964c..f8e6325 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -316,8 +316,14 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
>      if (ret == -1)
>          ret = -(s->get_error(s));
>  
> -    if (ret == -EAGAIN)
> +    if (ret == -EAGAIN) {
>          qemu_set_fd_handler2(s->fd, NULL, NULL, migrate_fd_put_notify, s);
> +    } else if (ret < 0) {
> +        if (s->mon) {
> +            monitor_resume(s->mon);
> +        }
> +        s->state = MIG_STATE_ERROR;
> +    }
>  
>      return ret;
>  }
>