proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-16 05:44:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migration: move contents of migration_close to migrate_fd_cleanup

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2013-02-22 17:36:46 +01:00 committed by Juan Quintela
parent 1964a39706
commit 404a7c05bc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
migration.c
View File

@ -272,6 +272,12 @@ static void migrate_fd_cleanup(void *opaque)
DPRINTF("closing file\n"); DPRINTF("closing file\n");
qemu_fclose(s->file); qemu_fclose(s->file);
s->file = NULL; 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); 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) static int migration_close(void *opaque)
{ {
MigrationState *s = opaque; return 0;
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);
} }
static int migration_get_fd(void *opaque) static int migration_get_fd(void *opaque)