[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/4] set proper migration status on ->write error (v
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 1/4] set proper migration status on ->write error (v5) |
Date: |
Thu, 19 Aug 2010 10:18:39 -0300 |
From: Marcelo Tosatti <address@hidden>
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>
Signed-off-by: Luiz Capitulino <address@hidden>
---
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;
}
--
1.7.2.1.97.g3235b