提交 fd45ee2c 编写于 作者: P Paolo Bonzini 提交者: Juan Quintela

migration: detect error before sleeping

Reviewed-by: NOrit Wasserman <owasserm@redhat.com>
Reviewed-by: NJuan Quintela <quintela@redhat.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NJuan Quintela <quintela@redhat.com>
上级 059f896c
...@@ -657,6 +657,10 @@ static void *migration_thread(void *opaque) ...@@ -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); current_time = qemu_get_clock_ms(rt_clock);
if (current_time >= initial_time + BUFFER_DELAY) { if (current_time >= initial_time + BUFFER_DELAY) {
uint64_t transferred_bytes = s->bytes_xfer; uint64_t transferred_bytes = s->bytes_xfer;
...@@ -682,9 +686,6 @@ static void *migration_thread(void *opaque) ...@@ -682,9 +686,6 @@ static void *migration_thread(void *opaque)
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000); g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
sleep_time += qemu_get_clock_ms(rt_clock) - current_time; 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(); qemu_mutex_lock_iothread();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册