diff mbox

[1/4] set proper migration status on ->write error (v5)

Message ID 1282223922-5971-2-git-send-email-lcapitulino@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino Aug. 19, 2010, 1:18 p.m. UTC 
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>
---
 buffered_file.c |    4 +++-
 migration.c     |    8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

Comments

Anthony Liguori Aug. 19, 2010, 3:19 p.m. UTC | #1 
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;
>   }
>
diff mbox

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