[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 05/14] migration: convert socket backend to accept MigrateAdd
From: |
Fabiano Rosas |
Subject: |
[PATCH v14 05/14] migration: convert socket backend to accept MigrateAddress |
Date: |
Thu, 19 Oct 2023 16:23:44 -0300 |
From: Het Gala <het.gala@nutanix.com>
Socket transport backend for 'migrate'/'migrate-incoming' QAPIs accept
new wire protocol of MigrateAddress struct.
It is achived by parsing 'uri' string and storing migration parameters
required for socket connection into well defined SocketAddress struct.
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 | 30 ++++++++++++++++++------------
migration/socket.c | 39 +++++++++------------------------------
migration/socket.h | 7 ++++---
3 files changed, 31 insertions(+), 45 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index e3608d7f60..0827dd1116 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -498,18 +498,21 @@ static void qemu_start_incoming_migration(const char
*uri, Error **errp)
migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,
MIGRATION_STATUS_SETUP);
- if (strstart(uri, "tcp:", &p) ||
- strstart(uri, "unix:", NULL) ||
- strstart(uri, "vsock:", NULL)) {
- socket_start_incoming_migration(p ? p : uri, errp);
+ if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
+ SocketAddress *saddr = &channel->u.socket;
+ if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
+ socket_start_incoming_migration(saddr, errp);
+ } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
+ fd_start_incoming_migration(saddr->u.fd.str, errp);
+ }
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
rdma_start_incoming_migration(p, errp);
#endif
} else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp);
- } else if (strstart(uri, "fd:", &p)) {
- fd_start_incoming_migration(p, errp);
} else if (strstart(uri, "file:", &p)) {
file_start_incoming_migration(p, errp);
} else {
@@ -1769,18 +1772,21 @@ void qmp_migrate(const char *uri, bool has_blk, bool
blk,
}
}
- if (strstart(uri, "tcp:", &p) ||
- strstart(uri, "unix:", NULL) ||
- strstart(uri, "vsock:", NULL)) {
- socket_start_outgoing_migration(s, p ? p : uri, &local_err);
+ if (channel->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
+ SocketAddress *saddr = &channel->u.socket;
+ if (saddr->type == SOCKET_ADDRESS_TYPE_INET ||
+ saddr->type == SOCKET_ADDRESS_TYPE_UNIX ||
+ saddr->type == SOCKET_ADDRESS_TYPE_VSOCK) {
+ socket_start_outgoing_migration(s, saddr, &local_err);
+ } else if (saddr->type == SOCKET_ADDRESS_TYPE_FD) {
+ fd_start_outgoing_migration(s, saddr->u.fd.str, &local_err);
+ }
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
rdma_start_outgoing_migration(s, p, &local_err);
#endif
} else if (strstart(uri, "exec:", &p)) {
exec_start_outgoing_migration(s, p, &local_err);
- } else if (strstart(uri, "fd:", &p)) {
- fd_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "file:", &p)) {
file_start_outgoing_migration(s, p, &local_err);
} else {
diff --git a/migration/socket.c b/migration/socket.c
index 1b6f5baefb..98e3ea1514 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -28,6 +28,8 @@
#include "trace.h"
#include "postcopy-ram.h"
#include "options.h"
+#include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-sockets.h"
struct SocketOutgoingArgs {
SocketAddress *saddr;
@@ -108,19 +110,19 @@ out:
object_unref(OBJECT(sioc));
}
-static void
-socket_start_outgoing_migration_internal(MigrationState *s,
- SocketAddress *saddr,
- Error **errp)
+void socket_start_outgoing_migration(MigrationState *s,
+ SocketAddress *saddr,
+ Error **errp)
{
QIOChannelSocket *sioc = qio_channel_socket_new();
struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
+ SocketAddress *addr = QAPI_CLONE(SocketAddress, saddr);
data->s = s;
/* in case previous migration leaked it */
qapi_free_SocketAddress(outgoing_args.saddr);
- outgoing_args.saddr = saddr;
+ outgoing_args.saddr = addr;
if (saddr->type == SOCKET_ADDRESS_TYPE_INET) {
data->hostname = g_strdup(saddr->u.inet.host);
@@ -135,18 +137,6 @@ socket_start_outgoing_migration_internal(MigrationState *s,
NULL);
}
-void socket_start_outgoing_migration(MigrationState *s,
- const char *str,
- Error **errp)
-{
- Error *err = NULL;
- SocketAddress *saddr = socket_parse(str, &err);
- if (!err) {
- socket_start_outgoing_migration_internal(s, saddr, &err);
- }
- error_propagate(errp, err);
-}
-
static void socket_accept_incoming_migration(QIONetListener *listener,
QIOChannelSocket *cioc,
gpointer opaque)
@@ -172,9 +162,8 @@ socket_incoming_migration_end(void *opaque)
object_unref(OBJECT(listener));
}
-static void
-socket_start_incoming_migration_internal(SocketAddress *saddr,
- Error **errp)
+void socket_start_incoming_migration(SocketAddress *saddr,
+ Error **errp)
{
QIONetListener *listener = qio_net_listener_new();
MigrationIncomingState *mis = migration_incoming_get_current();
@@ -213,13 +202,3 @@ socket_start_incoming_migration_internal(SocketAddress
*saddr,
}
}
-void socket_start_incoming_migration(const char *str, Error **errp)
-{
- Error *err = NULL;
- SocketAddress *saddr = socket_parse(str, &err);
- if (!err) {
- socket_start_incoming_migration_internal(saddr, &err);
- }
- qapi_free_SocketAddress(saddr);
- error_propagate(errp, err);
-}
diff --git a/migration/socket.h b/migration/socket.h
index dc54df4e6c..5e4c33b8ea 100644
--- a/migration/socket.h
+++ b/migration/socket.h
@@ -19,13 +19,14 @@
#include "io/channel.h"
#include "io/task.h"
+#include "qemu/sockets.h"
void socket_send_channel_create(QIOTaskFunc f, void *data);
QIOChannel *socket_send_channel_create_sync(Error **errp);
int socket_send_channel_destroy(QIOChannel *send);
-void socket_start_incoming_migration(const char *str, Error **errp);
+void socket_start_incoming_migration(SocketAddress *saddr, Error **errp);
-void socket_start_outgoing_migration(MigrationState *s, const char *str,
- Error **errp);
+void socket_start_outgoing_migration(MigrationState *s,
+ SocketAddress *saddr, Error **errp);
#endif
--
2.35.3
- Re: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress', (continued)
- Re: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress', Fabiano Rosas, 2023/10/20
- Re: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress', Markus Armbruster, 2023/10/20
- Re: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress', Daniel P . Berrangé, 2023/10/20
- Should we replace QAPI? (was: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress'), Markus Armbruster, 2023/10/23
- Re: Should we replace QAPI? (was: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress'), Daniel P . Berrangé, 2023/10/23
Re: [PATCH v14 02/14] fixup! migration: New QAPI type 'MigrateAddress', Daniel P . Berrangé, 2023/10/23
[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 <=
[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, 2023/10/19
[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