diff options
| author | Juan Quintela <quintela@redhat.com> | 2018-03-07 08:40:52 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2018-05-15 20:24:27 +0200 |
| commit | 36c2f8be2c4eb0003ac77a14910842b7ddd7337e (patch) | |
| tree | 8be939bdbec39d683a613ee152b11860b4725f98 /migration | |
| parent | 60df2d4ae59837d1a5afced71ec62a0c86c09f50 (diff) | |
migration: Delay start of migration main routines
We need to make sure that we have started all the multifd threads.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 4 | ||||
| -rw-r--r-- | migration/migration.h | 1 | ||||
| -rw-r--r-- | migration/ram.c | 3 | ||||
| -rw-r--r-- | migration/socket.c | 4 |
4 files changed, 10 insertions, 2 deletions
diff --git a/migration/migration.c b/migration/migration.c index 8e5b421b97..61c4ee7850 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -430,7 +430,7 @@ static void migration_incoming_setup(QEMUFile *f) qemu_file_set_blocking(f, false); } -static void migration_incoming_process(void) +void migration_incoming_process(void) { Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL); qemu_coroutine_enter(co); @@ -448,7 +448,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc) if (!mis->from_src_file) { QEMUFile *f = qemu_fopen_channel_input(ioc); - migration_fd_process_incoming(f); + migration_incoming_setup(f); return; } multifd_recv_new_channel(ioc); diff --git a/migration/migration.h b/migration/migration.h index 7c69598c54..26e5951d56 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -200,6 +200,7 @@ void migrate_set_state(int *state, int old_state, int new_state); void migration_fd_process_incoming(QEMUFile *f); void migration_ioc_process_incoming(QIOChannel *ioc); +void migration_incoming_process(void); bool migration_has_all_channels(void); diff --git a/migration/ram.c b/migration/ram.c index 87434d3fce..f7e8615e15 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -717,6 +717,9 @@ void multifd_recv_new_channel(QIOChannel *ioc) qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p, QEMU_THREAD_JOINABLE); atomic_inc(&multifd_recv_state->count); + if (multifd_recv_state->count == migrate_multifd_channels()) { + migration_incoming_process(); + } } /** diff --git a/migration/socket.c b/migration/socket.c index e09fd1aae5..7a5eb562b8 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -170,6 +170,10 @@ static void socket_accept_incoming_migration(QIONetListener *listener, qio_net_listener_disconnect(listener); object_unref(OBJECT(listener)); + + if (!migrate_use_multifd()) { + migration_incoming_process(); + } } } |