Patchwork set proper migration status on ->write error

login
register
mail settings
Submitter Marcelo Tosatti
Date July 7, 2010, 6:04 p.m.
Message ID <20100707180411.GA17569@amt.cnet>
Download mbox | patch
Permalink /patch/58138/
State New
Headers show

Comments

Marcelo Tosatti - July 7, 2010, 6:04 p.m.
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>
Blue Swirl - July 7, 2010, 6:14 p.m.
On Wed, Jul 7, 2010 at 6:04 PM, 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>
>
> 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;

Please check CODING_STYLE. It's different from kernel's version.
Juan Quintela - July 7, 2010, 6:37 p.m.
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;
>  }

Patch

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;
 }