| Message ID | 20180103122017.14794-13-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: cleanup migration_thread() | expand |
Peter Xu <peterx@redhat.com> wrote: > Keep the one in migrate_fd_cancel() would be enough. Removing the other ^^^^^^^ s/cancel/cleanup/ > two. > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> No need to respin for this one. I can just change it when pulling. Later, Juan.
diff --git a/migration/migration.c b/migration/migration.c index 16eb24c8b3..fbb41b8887 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1130,7 +1130,6 @@ void migrate_fd_error(MigrationState *s, const Error *error) MIGRATION_STATUS_FAILED); migrate_set_error(s, error); notifier_list_notify(&migration_state_notifiers, s); - block_cleanup_parameters(s); } static void migrate_fd_cancel(MigrationState *s) @@ -1176,7 +1175,6 @@ static void migrate_fd_cancel(MigrationState *s) s->block_inactive = false; } } - block_cleanup_parameters(s); } void add_migration_state_change_notifier(Notifier *notify)
Keep the one in migrate_fd_cancel() would be enough. Removing the other two. Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/migration.c | 2 -- 1 file changed, 2 deletions(-)