diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-22 17:36:33 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2013-03-11 13:32:02 +0100 |
| commit | fd45ee2c643bb3d55de5c54b50c23859ca631a9f (patch) | |
| tree | 78e6c88c7bbff66d35b094bd3169b2c4be63315a | |
| parent | 059f896cefb2776181e39d9ba69345bd9d07d52b (diff) | |
migration: detect error before sleeping
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/migration.c b/migration.c index 612ffa7438..414e0f9023 100644 --- a/migration.c +++ b/migration.c @@ -657,6 +657,10 @@ static void *migration_thread(void *opaque) } } + if (qemu_file_get_error(s->file)) { + migrate_finish_set_state(s, MIG_STATE_ERROR); + break; + } current_time = qemu_get_clock_ms(rt_clock); if (current_time >= initial_time + BUFFER_DELAY) { uint64_t transferred_bytes = s->bytes_xfer; @@ -682,9 +686,6 @@ static void *migration_thread(void *opaque) g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); sleep_time += qemu_get_clock_ms(rt_clock) - current_time; } - if (qemu_file_get_error(s->file)) { - migrate_finish_set_state(s, MIG_STATE_ERROR); - } } qemu_mutex_lock_iothread(); |