42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
From 853560d2513e360ca0dc690fba8a55ad7da31312 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Date: Fri, 22 Feb 2013 17:36:33 +0100
|
||
|
|
Subject: [PATCH 231/246] 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>
|
||
|
|
---
|
||
|
|
migration.c | 7 ++++---
|
||
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/migration.c b/migration.c
|
||
|
|
index a888f36..35c3455 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();
|
||
|
|
--
|
||
|
|
1.8.2.1
|
||
|
|
|