diff options
author | Juan Quintela | 2017-06-28 11:52:28 +0200 |
---|---|---|
committer | Dr. David Alan Gilbert | 2017-07-10 18:52:21 +0200 |
commit | f0afa331ce670ba39bde3f5620d75dcd56890cb6 (patch) | |
tree | 77687a22e3c6a33e8f05358189932c2a45ef91df /migration/migration.c | |
parent | migration: Convert ram to use new load_setup()/load_cleanup() (diff) | |
download | qemu-f0afa331ce670ba39bde3f5620d75dcd56890cb6.tar.gz qemu-f0afa331ce670ba39bde3f5620d75dcd56890cb6.tar.xz qemu-f0afa331ce670ba39bde3f5620d75dcd56890cb6.zip |
migration: Make compression_threads use save/load_setup/cleanup()
Once there, be consistent and use
compress_thread_{save,load}_{setup,cleanup}.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170628095228.4661-6-quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r-- | migration/migration.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/migration/migration.c b/migration/migration.c index 7e5dbd9b92..a0db40d364 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -286,7 +286,6 @@ static void process_incoming_migration_bh(void *opaque) } else { runstate_set(global_state_get_runstate()); } - migrate_decompress_threads_join(); /* * This must happen after any state changes since as soon as an external * observer sees this event they might start to prod at the VM assuming @@ -349,7 +348,6 @@ static void process_incoming_migration_co(void *opaque) migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_FAILED); error_report("load of migration failed: %s", strerror(-ret)); - migrate_decompress_threads_join(); exit(EXIT_FAILURE); } mis->bh = qemu_bh_new(process_incoming_migration_bh, mis); @@ -360,7 +358,6 @@ void migration_fd_process_incoming(QEMUFile *f) { Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f); - migrate_decompress_threads_create(); qemu_file_set_blocking(f, false); qemu_coroutine_enter(co); } @@ -827,7 +824,6 @@ static void migrate_fd_cleanup(void *opaque) } qemu_mutex_lock_iothread(); - migrate_compress_threads_join(); qemu_fclose(s->to_dst_file); s->to_dst_file = NULL; } @@ -1990,7 +1986,6 @@ void migrate_fd_connect(MigrationState *s) } } - migrate_compress_threads_create(); qemu_thread_create(&s->thread, "live_migration", migration_thread, s, QEMU_THREAD_JOINABLE); s->migration_thread_running = true; |