[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 11/14] migration: modify migration_channels_and_uri_compatibl
From: |
Fabiano Rosas |
Subject: |
[PATCH v14 11/14] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax |
Date: |
Thu, 19 Oct 2023 16:23:50 -0300 |
From: Het Gala <het.gala@nutanix.com>
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>
---
migration/migration.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index f5bad11777..5a721893f3 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -107,17 +107,20 @@ static bool migration_needs_multiple_sockets(void)
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) ||
- strstart(uri, "vsock:", NULL);
+ return saddr->type == SOCKET_ADDRESS_TYPE_INET ||
+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK;
}
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() &&
- !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)");
return false;
}
@@ -508,15 +511,15 @@ static void qemu_start_incoming_migration(const char
*uri, bool has_channels,
return;
}
- /* URI is not suitable for migration? */
- if (!migration_channels_and_uri_compatible(uri, errp)) {
- return;
- }
-
if (uri && !migrate_uri_parse(uri, &channel, errp)) {
return;
}
+ /* transport mechanism not suitable for migration? */
+ if (!migration_channels_and_transport_compatible(channel, errp)) {
+ return;
+ }
+
migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,
MIGRATION_STATUS_SETUP);
@@ -1794,15 +1797,15 @@ void qmp_migrate(const char *uri, bool has_channels,
return;
}
- /* URI is not suitable for migration? */
- if (!migration_channels_and_uri_compatible(uri, errp)) {
- return;
- }
-
if (!migrate_uri_parse(uri, &channel, errp)) {
return;
}
+ /* transport mechanism not suitable for migration? */
+ if (!migration_channels_and_transport_compatible(channel, errp)) {
+ return;
+ }
+
resume_requested = has_resume && resume;
if (!migrate_prepare(s, has_blk && blk, has_inc && inc,
resume_requested, errp)) {
--
2.35.3
- [PATCH v14 03/14] migration: convert migration 'uri' into 'MigrateAddress', (continued)
- [PATCH v14 03/14] migration: convert migration 'uri' into 'MigrateAddress', Fabiano Rosas, 2023/10/19
- [PATCH v14 04/14] fixup! migration: convert migration 'uri' into 'MigrateAddress', Fabiano Rosas, 2023/10/19
- [PATCH v14 05/14] migration: convert socket backend to accept MigrateAddress, Fabiano Rosas, 2023/10/19
- [PATCH v14 06/14] migration: convert rdma backend to accept MigrateAddress, Fabiano Rosas, 2023/10/19
- [PATCH v14 07/14] migration: convert exec backend to accept MigrateAddress., Fabiano Rosas, 2023/10/19
- [PATCH v14 08/14] migration: Convert the file backend the new QAPI syntax, Fabiano Rosas, 2023/10/19
- [PATCH v14 09/14] migration: New migrate and migrate-incoming argument 'channels', Fabiano Rosas, 2023/10/19
- [PATCH v14 10/14] fixup! migration: New migrate and migrate-incoming argument 'channels', Fabiano Rosas, 2023/10/19
- [PATCH v14 11/14] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax,
Fabiano Rosas <=
- [PATCH v14 12/14] migration: Implement MigrateChannelList to qmp migration flow., Fabiano Rosas, 2023/10/19
- [PATCH v14 13/14] migration: Implement MigrateChannelList to hmp migration flow., Fabiano Rosas, 2023/10/19
- [PATCH v14 14/14] migration: modify test_multifd_tcp_none() to use new QAPI syntax., Fabiano Rosas, 2023/10/19