From e447b1a603091cbaa5eed36c0a3c9ed3f2224535 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Thu, 19 Aug 2010 10:18:39 -0300 Subject: set proper migration status on ->write error (v5) 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 Signed-off-by: Luiz Capitulino Signed-off-by: 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 a79264f451..1836e7e242 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -230,8 +230,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 a160462dfa..468d51749f 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; } -- cgit v1.2.1