The qmp_migrate_finish function was recently removed in commit
2379a04e60 ("migration: Remove qmp_migrate_finish"), update comments
that mention it.Reviewed-by: Peter Xu <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Fabiano Rosas <[email protected]> --- migration/migration.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 7ab0294d22..850150a261 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1473,8 +1473,8 @@ void migration_cancel(void) } /* - * If qmp_migrate_finish has not been called, then there is no path that - * will complete the cancellation. Do it now. + * If migration_connect_outgoing has not been called, then there + * is no path that will complete the cancellation. Do it now. */ if (setup && !s->to_dst_file) { migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING, @@ -2057,11 +2057,12 @@ void qmp_migrate(const char *uri, bool has_channels, * For cpr-transfer, the target may not be listening yet on the migration * channel, because first it must finish cpr_load_state. The target tells * us it is listening by closing the cpr-state socket. Wait for that HUP - * event before connecting in qmp_migrate_finish. + * event before connecting in migration_connect_outgoing. * * The HUP could occur because the target fails while reading CPR state, * in which case the target will not listen for the incoming migration - * connection, so qmp_migrate_finish will fail to connect, and then recover. + * connection, so migration_connect_outgoing will fail to connect, + * and then recover. */ if (migrate_mode() == MIG_MODE_CPR_TRANSFER) { cpr_transfer_add_hup_watch(s, migration_connect_outgoing_cb, -- 2.51.0
