diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-22 17:36:46 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2013-03-11 13:32:03 +0100 |
| commit | 404a7c05bcc20c51fe1a9bf2deaeb4d6b658d3a3 (patch) | |
| tree | c3b6a0832ebdb404feee45636b6e58dd33ef2838 /migration.c | |
| parent | 1964a397063967acc5ce71a2a24ed26e74824ee1 (diff) | |
| download | qemu-404a7c05bcc20c51fe1a9bf2deaeb4d6b658d3a3.tar.gz | |
migration: move contents of migration_close to migrate_fd_cleanup
With this patch, the migration_file is not needed anymore.
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>
Diffstat (limited to 'migration.c')
| -rw-r--r-- | migration.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/migration.c b/migration.c index 4b04d50d58..64d8e4644e 100644 --- a/migration.c +++ b/migration.c @@ -272,6 +272,12 @@ static void migrate_fd_cleanup(void *opaque) DPRINTF("closing file\n"); qemu_fclose(s->file); s->file = NULL; + + qemu_mutex_unlock_iothread(); + qemu_thread_join(&s->thread); + qemu_mutex_lock_iothread(); + + migrate_fd_close(s); } assert(s->migration_file == NULL); @@ -523,16 +529,7 @@ static int migration_put_buffer(void *opaque, const uint8_t *buf, static int migration_close(void *opaque) { - MigrationState *s = opaque; - - DPRINTF("closing\n"); - - qemu_mutex_unlock_iothread(); - qemu_thread_join(&s->thread); - qemu_mutex_lock_iothread(); - assert(s->state != MIG_STATE_ACTIVE); - - return migrate_fd_close(s); + return 0; } static int migration_get_fd(void *opaque) |