| Message ID | 20231009143615.86825-10-het.gala@nutanix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration | expand |
Het Gala <het.gala@nutanix.com> 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 <aravind.retnakaran@nutanix.com> > Signed-off-by: Het Gala <het.gala@nutanix.com> > --- > 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..21b57f7ed8 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 = NULL; No g_autoptr here because the list code will already free the channel. > > - qmp_migrate_incoming(uri, false, NULL, &err); > + migrate_uri_parse(uri, &channel, &err); Need to check the return value of this function. $ (echo "migrate -d unix:") | ./qemu-system-x86_64 -monitor stdio -display none QEMU 8.1.50 monitor - type 'help' for more information (qemu) migrate -d unix: Segmentation fault (core dumped) > + 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 = NULL; > > - 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; > }
On 10/10/2023 2:38 AM, Fabiano Rosas wrote: > Het Gala<het.gala@nutanix.com> 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<aravind.retnakaran@nutanix.com> >> Signed-off-by: Het Gala<het.gala@nutanix.com> >> --- >> 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..21b57f7ed8 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 = NULL; > No g_autoptr here because the list code will already free the channel. Yes, g_autoptr is not needed here. Removing g_autoptr passes all the make checks (even -qcow2 181 test)but the return value is not right of the hmp_migrate() function. >> >> - qmp_migrate_incoming(uri, false, NULL, &err); >> + migrate_uri_parse(uri, &channel, &err); > Need to check the return value of this function. > > $ (echo "migrate -d unix:") | ./qemu-system-x86_64 -monitor stdio -display none > QEMU 8.1.50 monitor - type 'help' for more information > (qemu) migrate -d unix: > Segmentation fault (core dumped) Yes, there is something wrong here, expected result should have been : (qemu) migrate -d unix: Error: invalid Unix socket address or (qemu) migrate -d tcp:12.11.34.142 Error: error parsing address '12.11.34.142' I am investigating it right now. Will update on it and try to resolve it soon. >> + 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 = NULL; >> >> - 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; >> } Regards, Het Gala
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index a2e6a5c51e..21b57f7ed8 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 = NULL; - 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 = NULL; - 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 ff04728b33..a651106bff 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -432,9 +432,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 \
Integrate MigrateChannelList with all transport backends (socket, exec and rdma) for both src and dest migration endpoints for hmp migration. Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com> Signed-off-by: Het Gala <het.gala@nutanix.com> --- migration/migration-hmp-cmds.c | 15 +++++++++++++-- migration/migration.c | 5 ++--- migration/migration.h | 3 ++- 3 files changed, 17 insertions(+), 6 deletions(-)