]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
migration: remove some block_cleanup_parameters()
authorPeter Xu <peterx@redhat.com>
Wed, 3 Jan 2018 12:20:16 +0000 (20:20 +0800)
committerJuan Quintela <quintela@redhat.com>
Mon, 15 Jan 2018 11:48:12 +0000 (12:48 +0100)
Keep the one in migrate_fd_cleanup() would be enough.  Removing the other
two.

Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
migration/migration.c

index 793fd163f7d0146fce137a286fc47ad847d5b46e..47367cffae0c61b86e90183f24e6373cd5112430 100644 (file)
@@ -1160,7 +1160,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)
@@ -1206,7 +1205,6 @@ static void migrate_fd_cancel(MigrationState *s)
             s->block_inactive = false;
         }
     }
-    block_cleanup_parameters(s);
 }
 
 void add_migration_state_change_notifier(Notifier *notify)