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

migration: convert exec backend to accept MigrateAddress.

Browse Source 
Exec 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 exec connection into strList struct.

Suggested-by: Aravind Retnakaran <aravind.retnakaran@nutanix.com>
Signed-off-by: Het Gala <het.gala@nutanix.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-8-farosas@suse.de>
This commit is contained in:
Het Gala 2023-10-23 15:20:46 -03:00 committed by Juan Quintela
parent 3fa9642ff7
commit cbab4face5
3 changed files with 59 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
migration/exec.c
View File

@ -39,18 +39,49 @@ const char *exec_get_cmd_path(void)
} }
#endif #endif
void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) /* provides the length of strList */
static int
str_list_length(strList *list)
{
int len = 0;
strList *elem;
for (elem = list; elem != NULL; elem = elem->next) {
len++;
}
return len;
}
static void
init_exec_array(strList *command, char **argv, Error **errp)
{
int i = 0;
strList *lst;
for (lst = command; lst; lst = lst->next) {
argv[i++] = lst->value;
}
argv[i] = NULL;
return;
}
void exec_start_outgoing_migration(MigrationState *s, strList *command,
Error **errp)
{ {
QIOChannel *ioc; QIOChannel *ioc;
#ifdef WIN32 int length = str_list_length(command);
const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL }; g_auto(GStrv) argv = (char **) g_new0(const char *, length + 1);
#else
const char *argv[] = { "/bin/sh", "-c", command, NULL };
#endif
trace_migration_exec_outgoing(command); init_exec_array(command, argv, errp);
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, g_autofree char *new_command = g_strjoinv(" ", (char **)argv);
trace_migration_exec_outgoing(new_command);
ioc = QIO_CHANNEL(
qio_channel_command_new_spawn(
(const char * const *) g_steal_pointer(&argv),
O_RDWR, O_RDWR,
errp)); errp));
if (!ioc) { if (!ioc) {
@ -71,18 +102,20 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
void exec_start_incoming_migration(const char *command, Error **errp) void exec_start_incoming_migration(strList *command, Error **errp)
{ {
QIOChannel *ioc; QIOChannel *ioc;
#ifdef WIN32 int length = str_list_length(command);
const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL }; g_auto(GStrv) argv = (char **) g_new0(const char *, length + 1);
#else
const char *argv[] = { "/bin/sh", "-c", command, NULL };
#endif
trace_migration_exec_incoming(command); init_exec_array(command, argv, errp);
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, g_autofree char *new_command = g_strjoinv(" ", (char **)argv);
trace_migration_exec_incoming(new_command);
ioc = QIO_CHANNEL(
qio_channel_command_new_spawn(
(const char * const *) g_steal_pointer(&argv),
O_RDWR, O_RDWR,
errp)); errp));
if (!ioc) { if (!ioc) {

4
migration/exec.h
View File

@ -23,8 +23,8 @@
#ifdef WIN32 #ifdef WIN32
const char *exec_get_cmd_path(void); const char *exec_get_cmd_path(void);
#endif #endif
void exec_start_incoming_migration(const char *host_port, Error **errp); void exec_start_incoming_migration(strList *host_port, Error **errp);
void exec_start_outgoing_migration(MigrationState *s, const char *host_port, void exec_start_outgoing_migration(MigrationState *s, strList *host_port,
Error **errp); Error **errp);
#endif #endif

8
migration/migration.c
View File

@ -549,8 +549,8 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
} }
rdma_start_incoming_migration(&channel->u.rdma, errp); rdma_start_incoming_migration(&channel->u.rdma, errp);
#endif #endif
} else if (strstart(uri, "exec:", &p)) { } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
exec_start_incoming_migration(p, errp); exec_start_incoming_migration(channel->u.exec.args, errp);
} else if (strstart(uri, "file:", &p)) { } else if (strstart(uri, "file:", &p)) {
file_start_incoming_migration(p, errp); file_start_incoming_migration(p, errp);
} else { } else {
@ -1938,8 +1938,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) { } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) {
rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err); rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err);
#endif #endif
} else if (strstart(uri, "exec:", &p)) { } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) {
exec_start_outgoing_migration(s, p, &local_err); exec_start_outgoing_migration(s, channel->u.exec.args, &local_err);
} else if (strstart(uri, "file:", &p)) { } else if (strstart(uri, "file:", &p)) {
file_start_outgoing_migration(s, p, &local_err); file_start_outgoing_migration(s, p, &local_err);
} else { } else {