Het Gala <[email protected]> writes:
> Integrate MigrateChannelList with all transport backends
> (socket, exec and rdma) for both src and dest migration
> endpoints for hmp migration.
>
> Suggested-by: Aravind Retnakaran <[email protected]>
> Signed-off-by: Het Gala <[email protected]>
> Reviewed-by: Daniel P. Berrangé <[email protected]>
> ---
> migration/migration-hmp-cmds.c | 15 +++++++++++++--
> migration/migration.c | 5 ++---
> migration/migration.h | 3 ++-
> 3 files changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
> index a2e6a5c51e..a1657f3d37 100644
> --- a/migration/migration-hmp-cmds.c
> +++ b/migration/migration-hmp-cmds.c
> @@ -441,9 +441,14 @@ void hmp_migrate_incoming(Monitor *mon, const QDict
> *qdict)
> {
> Error *err = NULL;
> const char *uri = qdict_get_str(qdict, "uri");
> + MigrationChannelList *caps = NULL;
> + g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
Just the pointer here. If I remember correctly the g_autoptr here would
cause a double free when freeing the caps.
>
> - qmp_migrate_incoming(uri, false, NULL, &err);
> + migrate_uri_parse(uri, &channel, &err);
> + QAPI_LIST_PREPEND(caps, channel);
>
> + qmp_migrate_incoming(NULL, true, caps, &err);
> + qapi_free_MigrationChannelList(caps);
> hmp_handle_error(mon, err);
> }
>
> @@ -730,9 +735,15 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
> bool resume = qdict_get_try_bool(qdict, "resume", false);
> const char *uri = qdict_get_str(qdict, "uri");
> Error *err = NULL;
> + MigrationChannelList *caps = NULL;
> + g_autoptr(MigrationChannel) channel = g_new0(MigrationChannel, 1);
Same here. We free the channel via caps and we attribute it below, no
need to allocate.
>
> - qmp_migrate(uri, false, NULL, !!blk, blk, !!inc, inc,
> + migrate_uri_parse(uri, &channel, &err);
> + QAPI_LIST_PREPEND(caps, channel);
> +
> + qmp_migrate(NULL, true, caps, !!blk, blk, !!inc, inc,
> false, false, true, resume, &err);
> + qapi_free_MigrationChannelList(caps);
> if (hmp_handle_error(mon, err)) {
> return;
> }
> diff --git a/migration/migration.c b/migration/migration.c
> index 3eae32e616..7d2d5ae329 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -431,9 +431,8 @@ void migrate_add_address(SocketAddress *address)
> QAPI_CLONE(SocketAddress, address));
> }
>
> -static bool migrate_uri_parse(const char *uri,
> - MigrationChannel **channel,
> - Error **errp)
> +bool migrate_uri_parse(const char *uri, MigrationChannel **channel,
> + Error **errp)
> {
> g_autoptr(MigrationChannel) val = g_new0(MigrationChannel, 1);
> g_autoptr(MigrationAddress) addr = g_new0(MigrationAddress, 1);
> diff --git a/migration/migration.h b/migration/migration.h
> index 972597f4de..f9127707f5 100644
> --- a/migration/migration.h
> +++ b/migration/migration.h
> @@ -511,7 +511,8 @@ bool check_dirty_bitmap_mig_alias_map(const
> BitmapMigrationNodeAliasList *bbm,
> Error **errp);
>
> void migrate_add_address(SocketAddress *address);
> -
> +bool migrate_uri_parse(const char *uri, MigrationChannel **channel,
> + Error **errp);
> int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque);
>
> #define qemu_ram_foreach_block \
