mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: modify migration_channels_and_uri_compatible() for new QAPI syntax

Browse Source 
migration_channels_and_uri_compatible() check for transport mechanism
suitable for multifd migration gets executed when the caller calls old
uri syntax. It needs it to be run when using the modern MigrateChannel
QAPI syntax too.

After URI -> 'MigrateChannel' :
migration_channels_and_uri_compatible() ->
migration_channels_and_transport_compatible() passes object as argument
and check for valid transport mechanism.

Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231023182053.8711-12-farosas@suse.de>
This commit is contained in:
Het Gala 2023-10-23 15:20:50 -03:00 committed by Juan Quintela
parent 074dbce5fc
commit d95533e1cd
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
migration/migration.c
View File

@ -128,17 +128,20 @@ static bool migration_needs_multiple_sockets(void)
return migrate_multifd() || migrate_postcopy_preempt(); return migrate_multifd() || migrate_postcopy_preempt();
} }
static bool uri_supports_multi_channels(const char *uri) static bool transport_supports_multi_channels(SocketAddress *saddr)
{ {
return strstart(uri, "tcp:", NULL) || strstart(uri, "unix:", NULL) || return saddr->type == SOCKET_ADDRESS_TYPE_INET ||
strstart(uri, "vsock:", NULL); saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
saddr->type == SOCKET_ADDRESS_TYPE_VSOCK;
} }
static bool static bool
migration_channels_and_uri_compatible(const char *uri, Error **errp) migration_channels_and_transport_compatible(MigrationAddress *addr,
Error **errp)
{ {
if (migration_needs_multiple_sockets() && if (migration_needs_multiple_sockets() &&
!uri_supports_multi_channels(uri)) { (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) &&
!transport_supports_multi_channels(&addr->u.socket)) {
error_setg(errp, "Migration requires multi-channel URIs (e.g. tcp)"); error_setg(errp, "Migration requires multi-channel URIs (e.g. tcp)");
return false; return false;
} }
@ -534,12 +537,12 @@ static void qemu_start_incoming_migration(const char *uri, bool has_channels,
return; return;
} }
/* URI is not suitable for migration? */ if (uri && !migrate_uri_parse(uri, &channel, errp)) {
if (!migration_channels_and_uri_compatible(uri, errp)) {
return; return;
} }
if (uri && !migrate_uri_parse(uri, &channel, errp)) { /* transport mechanism not suitable for migration? */
if (!migration_channels_and_transport_compatible(channel, errp)) {
return; return;
} }
@ -1947,12 +1950,12 @@ void qmp_migrate(const char *uri, bool has_channels,
return; return;
} }
/* URI is not suitable for migration? */ if (!migrate_uri_parse(uri, &channel, errp)) {
if (!migration_channels_and_uri_compatible(uri, errp)) {
return; return;
} }
if (!migrate_uri_parse(uri, &channel, errp)) { /* transport mechanism not suitable for migration? */
if (!migration_channels_and_transport_compatible(channel, errp)) {
return; return;
} }