[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/41] migration: detect error before sleeping
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 26/41] migration: detect error before sleeping |
Date: |
Fri, 15 Feb 2013 18:46:58 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/migration.c b/migration.c
index 5e2077e..63ecab5 100644
--- a/migration.c
+++ b/migration.c
@@ -644,6 +644,10 @@ static void *migration_thread(void *opaque)
}
}
}
+ if (qemu_file_get_error(s->file)) {
+ __sync_val_compare_and_swap(&s->state, MIG_STATE_ACTIVE,
MIG_STATE_ERROR);
+ break;
+ }
if (current_time >= initial_time + BUFFER_DELAY) {
uint64_t transferred_bytes = s->bytes_xfer;
uint64_t time_spent = current_time - initial_time;
@@ -661,9 +665,6 @@ static void *migration_thread(void *opaque)
/* usleep expects microseconds */
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
}
- if (qemu_file_get_error(s->file)) {
- __sync_val_compare_and_swap(&s->state, MIG_STATE_ACTIVE,
MIG_STATE_ERROR);
- }
}
qemu_mutex_lock_iothread();
--
1.7.1
- Re: [Qemu-devel] [PATCH 20/41] migration: run pending/iterate callbacks out of big lock, (continued)
- [Qemu-devel] [PATCH 22/41] migration: yay, buffering is gone, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 27/41] migration: remove useless qemu_file_get_error check, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 25/41] migration: eliminate last_round, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 26/41] migration: detect error before sleeping,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 30/41] qemu-file: fsync a writable stdio QEMUFile, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 31/41] qemu-file: check exit status when closing a pipe QEMUFile, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 39/41] migration: move contents of migration_close to migrate_fd_cleanup, Paolo Bonzini, 2013/02/15