openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: inline migrate_fd_close 

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:48 +01:00 committed by Juan Quintela
parent b352365f5a
commit 6f190a0641
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration.c
View File

@ -274,10 +274,10 @@ static void migrate_fd_cleanup(void *opaque)
qemu_thread_join(&s->thread); qemu_thread_join(&s->thread);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
migrate_fd_close(s); qemu_fclose(s->file);
s->file = NULL;
} }
assert(s->file == NULL);
assert(s->state != MIG_STATE_ACTIVE); assert(s->state != MIG_STATE_ACTIVE);
if (s->state != MIG_STATE_COMPLETED) { if (s->state != MIG_STATE_COMPLETED) {
@ -311,16 +311,6 @@ static void migrate_fd_cancel(MigrationState *s)
migrate_finish_set_state(s, MIG_STATE_CANCELLED); migrate_finish_set_state(s, MIG_STATE_CANCELLED);
} }
int migrate_fd_close(MigrationState *s)
{
int rc = 0;
if (s->file != NULL) {
rc = qemu_fclose(s->file);
s->file = NULL;
}
return rc;
}
void add_migration_state_change_notifier(Notifier *notify) void add_migration_state_change_notifier(Notifier *notify)
{ {
notifier_list_add(&migration_state_notifiers, notify); notifier_list_add(&migration_state_notifiers, notify);