From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=49540 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OWZUv-0002EX-TX
	for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:37:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <quintela@redhat.com>) id 1OWZUu-0007JA-PT
	for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:37:29 -0400
Received: from mx1.redhat.com ([209.132.183.28]:64191)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <quintela@redhat.com>) id 1OWZUu-0007Ip-Iv
	for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:37:28 -0400
From: Juan Quintela <quintela@redhat.com>
In-Reply-To: <20100707180411.GA17569@amt.cnet> (Marcelo Tosatti's message of
	"Wed, 7 Jul 2010 15:04:11 -0300")
References: <20100707180411.GA17569@amt.cnet>
Date: Wed, 07 Jul 2010 20:37:22 +0200
Message-ID: <m3wrt75eal.fsf@trasno.mitica>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [Qemu-devel] Re: [PATCH] set proper migration status on ->write
	error
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

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>

Acked-by: Juan Quintela <quintela@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..5bf2f4e 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -318,6 +318,8 @@ ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size)
>  
>      if (ret == -EAGAIN)
>          qemu_set_fd_handler2(s->fd, NULL, NULL, migrate_fd_put_notify, s);
> +    else
> +        s->state = MIG_STATE_ERROR;
>  
>      return ret;
>  }