* [Qemu-devel] [PATCH] set proper migration status on ->write error
@ 2010-07-07 18:04 Marcelo Tosatti
2010-07-07 18:14 ` Blue Swirl
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Marcelo Tosatti @ 2010-07-07 18:04 UTC (permalink / raw)
To: Anthony Liguori, Juan Quintela; +Cc: qemu-devel
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;
return ret;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH] set proper migration status on ->write error
2010-07-07 18:04 [Qemu-devel] [PATCH] set proper migration status on ->write error Marcelo Tosatti
@ 2010-07-07 18:14 ` Blue Swirl
2010-07-07 19:42 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v2) Marcelo Tosatti
2010-07-07 18:37 ` [Qemu-devel] Re: [PATCH] set proper migration status on ->write error Juan Quintela
2010-07-09 18:18 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v3) Marcelo Tosatti
2 siblings, 1 reply; 12+ messages in thread
From: Blue Swirl @ 2010-07-07 18:14 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: qemu-devel, Juan Quintela
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.
^ permalink raw reply [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH] set proper migration status on ->write error (v2)
2010-07-07 18:14 ` Blue Swirl
@ 2010-07-07 19:42 ` Marcelo Tosatti
2010-07-07 23:17 ` [Qemu-devel] " Juan Quintela
0 siblings, 1 reply; 12+ messages in thread
From: Marcelo Tosatti @ 2010-07-07 19:42 UTC (permalink / raw)
To: Blue Swirl; +Cc: qemu-devel, Juan Quintela
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..433f08f 100644
--- a/migration.c
+++ b/migration.c
@@ -316,8 +316,11 @@ 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 {
+ s->state = MIG_STATE_ERROR;
+ }
return ret;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] Re: [PATCH] set proper migration status on ->write error
2010-07-07 18:04 [Qemu-devel] [PATCH] set proper migration status on ->write error Marcelo Tosatti
2010-07-07 18:14 ` Blue Swirl
@ 2010-07-07 18:37 ` Juan Quintela
2010-07-09 18:18 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v3) Marcelo Tosatti
2 siblings, 0 replies; 12+ messages in thread
From: Juan Quintela @ 2010-07-07 18:37 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: qemu-devel
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;
> }
^ permalink raw reply [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH] set proper migration status on ->write error (v3)
2010-07-07 18:04 [Qemu-devel] [PATCH] set proper migration status on ->write error Marcelo Tosatti
2010-07-07 18:14 ` Blue Swirl
2010-07-07 18:37 ` [Qemu-devel] Re: [PATCH] set proper migration status on ->write error Juan Quintela
@ 2010-07-09 18:18 ` Marcelo Tosatti
2010-07-13 1:33 ` [Qemu-devel] " Luiz Capitulino
2 siblings, 1 reply; 12+ messages in thread
From: Marcelo Tosatti @ 2010-07-09 18:18 UTC (permalink / raw)
To: Anthony Liguori, Juan Quintela, Luiz Capitulino; +Cc: qemu-devel
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..862dc4f 100644
--- a/migration.c
+++ b/migration.c
@@ -316,8 +316,12 @@ 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) {
+ monitor_resume(s);
+ s->state = MIG_STATE_ERROR;
+ }
return ret;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] Re: [PATCH] set proper migration status on ->write error (v3)
2010-07-09 18:18 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v3) Marcelo Tosatti
@ 2010-07-13 1:33 ` Luiz Capitulino
2010-07-13 17:30 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v4) Marcelo Tosatti
0 siblings, 1 reply; 12+ messages in thread
From: Luiz Capitulino @ 2010-07-13 1:33 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: qemu-devel, Juan Quintela
On Fri, 9 Jul 2010 15:18:51 -0300
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..862dc4f 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -316,8 +316,12 @@ 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) {
> + monitor_resume(s);
You have to pass s->mon, but I forgot to mention that you also have to
check for NULL like migrate_fd_cleanup():
if (s->mon) {
monitor_resume(s->mon);
}
Also, there's a comment in migrate_fd_cleanup() saying that we should only
resume the monitor when all buffers have been flushed. I assume
buffred_close() will do that.
> + s->state = MIG_STATE_ERROR;
> + }
>
> return ret;
> }
>
^ permalink raw reply [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH] set proper migration status on ->write error (v4)
2010-07-13 1:33 ` [Qemu-devel] " Luiz Capitulino
@ 2010-07-13 17:30 ` Marcelo Tosatti
2010-07-13 22:35 ` [Qemu-devel] " Luiz Capitulino
0 siblings, 1 reply; 12+ messages in thread
From: Marcelo Tosatti @ 2010-07-13 17:30 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: qemu-devel, Juan Quintela
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..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);
+ }
+ s->state = MIG_STATE_ERROR;
+ }
return ret;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] Re: [PATCH] set proper migration status on ->write error (v4)
2010-07-13 17:30 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v4) Marcelo Tosatti
@ 2010-07-13 22:35 ` Luiz Capitulino
2010-07-14 0:01 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v5) Marcelo Tosatti
0 siblings, 1 reply; 12+ messages in thread
From: Luiz Capitulino @ 2010-07-13 22:35 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: qemu-devel, Juan Quintela
On Tue, 13 Jul 2010 14:30:22 -0300
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..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);
s/monitor_resume(s)/monitor_resume(s->mon)
> + }
> + s->state = MIG_STATE_ERROR;
> + }
>
> return ret;
> }
>
^ permalink raw reply [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH] set proper migration status on ->write error (v5)
2010-07-13 22:35 ` [Qemu-devel] " Luiz Capitulino
@ 2010-07-14 0:01 ` Marcelo Tosatti
2010-07-14 16:39 ` [Qemu-devel] " Luiz Capitulino
0 siblings, 1 reply; 12+ messages in thread
From: Marcelo Tosatti @ 2010-07-14 0:01 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: qemu-devel, Juan Quintela
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..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;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] Re: [PATCH] set proper migration status on ->write error (v5)
2010-07-14 0:01 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v5) Marcelo Tosatti
@ 2010-07-14 16:39 ` Luiz Capitulino
2010-07-14 17:30 ` Marcelo Tosatti
0 siblings, 1 reply; 12+ messages in thread
From: Luiz Capitulino @ 2010-07-14 16:39 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: qemu-devel, aurelien, Juan Quintela
On Tue, 13 Jul 2010 21:01:33 -0300
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>
Looks good now, I guess it's good for stable too, isn't it?
Reviewed-by: Luiz Capitulino <lcapitulino@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..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;
> }
>
^ permalink raw reply [flat|nested] 12+ messages in thread* [Qemu-devel] Re: [PATCH] set proper migration status on ->write error (v5)
2010-07-14 16:39 ` [Qemu-devel] " Luiz Capitulino
@ 2010-07-14 17:30 ` Marcelo Tosatti
0 siblings, 0 replies; 12+ messages in thread
From: Marcelo Tosatti @ 2010-07-14 17:30 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: qemu-devel, aurelien, Juan Quintela
On Wed, Jul 14, 2010 at 01:39:46PM -0300, Luiz Capitulino wrote:
> On Tue, 13 Jul 2010 21:01:33 -0300
> 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>
>
> Looks good now, I guess it's good for stable too, isn't it?
>
> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Yep, good for stable.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2010-07-15 16:31 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-07 18:04 [Qemu-devel] [PATCH] set proper migration status on ->write error Marcelo Tosatti
2010-07-07 18:14 ` Blue Swirl
2010-07-07 19:42 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v2) Marcelo Tosatti
2010-07-07 23:17 ` [Qemu-devel] " Juan Quintela
2010-07-07 18:37 ` [Qemu-devel] Re: [PATCH] set proper migration status on ->write error Juan Quintela
2010-07-09 18:18 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v3) Marcelo Tosatti
2010-07-13 1:33 ` [Qemu-devel] " Luiz Capitulino
2010-07-13 17:30 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v4) Marcelo Tosatti
2010-07-13 22:35 ` [Qemu-devel] " Luiz Capitulino
2010-07-14 0:01 ` [Qemu-devel] [PATCH] set proper migration status on ->write error (v5) Marcelo Tosatti
2010-07-14 16:39 ` [Qemu-devel] " Luiz Capitulino
2010-07-14 17:30 ` Marcelo Tosatti
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.