[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH] set proper migration status on ->write error (v
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] Re: [PATCH] set proper migration status on ->write error (v5) |
Date: |
Wed, 14 Jul 2010 13:39:46 -0300 |
On Tue, 13 Jul 2010 21:01:33 -0300
Marcelo Tosatti <address@hidden> 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 <address@hidden>
Looks good now, I guess it's good for stable too, isn't it?
Reviewed-by: Luiz Capitulino <address@hidden>
>
> 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;
> }
>