[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/35] migration: move exit condition to migration t
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 22/35] migration: move exit condition to migration thread |
Date: |
Tue, 11 Dec 2012 13:46:58 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/migration.c b/migration.c
index 031302b..5c2f413 100644
--- a/migration.c
+++ b/migration.c
@@ -676,12 +676,6 @@ static bool migrate_fd_put_ready(MigrationState *s,
uint64_t max_size)
bool last_round = false;
qemu_mutex_lock_iothread();
- if (s->state != MIG_STATE_ACTIVE) {
- DPRINTF("put_ready returning because of non-active state\n");
- qemu_mutex_unlock_iothread();
- return false;
- }
-
DPRINTF("iterate\n");
pending_size = qemu_savevm_state_pending(s->file, max_size);
DPRINTF("pending size %lu max %lu\n", pending_size, max_size);
@@ -748,9 +742,18 @@ static void *buffered_file_thread(void *opaque)
while (true) {
int64_t current_time = qemu_get_clock_ms(rt_clock);
- if (s->migration_state->complete) {
+ qemu_mutex_lock_iothread();
+ if (m->state != MIG_STATE_ACTIVE) {
+ DPRINTF("put_ready returning because of non-active state\n");
+ qemu_mutex_unlock_iothread();
break;
}
+ if (m->complete) {
+ qemu_mutex_unlock_iothread();
+ break;
+ }
+ qemu_mutex_unlock_iothread();
+
if (current_time >= initial_time + BUFFER_DELAY) {
uint64_t transferred_bytes = s->bytes_xfer;
uint64_t time_spent = current_time - initial_time;
--
1.7.11.7
- [Qemu-devel] [PATCH 14/35] migration: include qemu-file.h, (continued)
- [Qemu-devel] [PATCH 14/35] migration: include qemu-file.h, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 11/35] buffered_file: don't flush on put buffer, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 12/35] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 13/35] savevm: New save live migration method: pending, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 15/35] migration-fd: remove duplicate include, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 10/35] buffered_file: Unfold the trick to restart generating migration data, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 18/35] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 23/35] migration: unfold rest of migrate_fd_put_ready() into thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 17/35] migration: move migration_fd_put_ready(), Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 16/35] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 22/35] migration: move exit condition to migration thread,
Juan Quintela <=
- [Qemu-devel] [PATCH 28/35] migration: Only go to the iterate stage if there is anything to send, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 20/35] migration: move begining stage to the migration thread, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 19/35] migration: move migration notifier, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 25/35] ram: Add last_sent_block, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 21/35] migration: Add buffered_flush error handling, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 27/35] ram: Use memory_region_test_and_clear_dirty, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 26/35] memory: introduce memory_region_test_and_clear_dirty, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 24/35] ram: rename last_block to last_seen_block, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 35/35] migration: print times for end phase, Juan Quintela, 2012/12/11
- [Qemu-devel] [PATCH 32/35] ram: add free_space parameter to save_live functions, Juan Quintela, 2012/12/11