aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2010-08-19 10:18:39 -0300
committerLuiz Capitulino <lcapitulino@redhat.com>2010-10-11 19:52:25 -0300
commitc4127fbf17744374b147b779a333e7bf444839a7 (patch)
treef418cd2d2bd3e0a66a60c9ee5929c73aa217c921
parentfc4e0c7018f023a415b39984c4b805992fd6cc17 (diff)
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 <mtosatti@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit e447b1a603091cbaa5eed36c0a3c9ed3f2224535)
-rw-r--r--buffered_file.c4
-rw-r--r--migration.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/buffered_file.c b/buffered_file.c
index 54dc6c29ba..be147d62d5 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 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;
}