From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=42482 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Om6uT-0006ZB-5T
	for qemu-devel@nongnu.org; Thu, 19 Aug 2010 11:20:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Om6uR-00060L-9u
	for qemu-devel@nongnu.org; Thu, 19 Aug 2010 11:20:04 -0400
Received: from mail-gw0-f45.google.com ([74.125.83.45]:52720)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Om6uR-0005vU-6O
	for qemu-devel@nongnu.org; Thu, 19 Aug 2010 11:20:03 -0400
Received: by mail-gw0-f45.google.com with SMTP id 11so809227gwb.4
	for <qemu-devel@nongnu.org>; Thu, 19 Aug 2010 08:20:03 -0700 (PDT)
Message-ID: <4C6D4B9E.4000109@codemonkey.ws>
Date: Thu, 19 Aug 2010 10:19:58 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/4] set proper migration status on ->write
	error (v5)
References: <1282223922-5971-1-git-send-email-lcapitulino@redhat.com>
	<1282223922-5971-2-git-send-email-lcapitulino@redhat.com>
In-Reply-To: <1282223922-5971-2-git-send-email-lcapitulino@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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: Luiz Capitulino <lcapitulino@redhat.com>
Cc: aliguori@us.ibm.com, Marcelo Tosatti <mtosatti@redhat.com>, qemu-devel@nongnu.org

On 08/19/2010 08:18 AM, Luiz Capitulino wrote:
> From: Marcelo Tosatti<mtosatti@redhat.com>
>
> 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>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   buffered_file.c |    4 +++-
>   migration.c     |    8 +++++++-
>   2 files changed, 10 insertions(+), 2 deletions(-)
>
> 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 650eb78..dbb8fd6 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -314,8 +314,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;
>   }
>