mirror of
https://github.com/mii443/qemu.git
synced 2025-08-22 15:15:46 +00:00
migration: convert exec backend to accept MigrateAddress.
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:
@ -39,20 +39,51 @@ const char *exec_get_cmd_path(void)
|
||||
}
|
||||
#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;
|
||||
|
||||
#ifdef WIN32
|
||||
const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
|
||||
#else
|
||||
const char *argv[] = { "/bin/sh", "-c", command, NULL };
|
||||
#endif
|
||||
int length = str_list_length(command);
|
||||
g_auto(GStrv) argv = (char **) g_new0(const char *, length + 1);
|
||||
|
||||
trace_migration_exec_outgoing(command);
|
||||
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
|
||||
O_RDWR,
|
||||
errp));
|
||||
init_exec_array(command, argv, errp);
|
||||
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,
|
||||
errp));
|
||||
if (!ioc) {
|
||||
return;
|
||||
}
|
||||
@ -71,20 +102,22 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
|
||||
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;
|
||||
|
||||
#ifdef WIN32
|
||||
const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
|
||||
#else
|
||||
const char *argv[] = { "/bin/sh", "-c", command, NULL };
|
||||
#endif
|
||||
int length = str_list_length(command);
|
||||
g_auto(GStrv) argv = (char **) g_new0(const char *, length + 1);
|
||||
|
||||
trace_migration_exec_incoming(command);
|
||||
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
|
||||
O_RDWR,
|
||||
errp));
|
||||
init_exec_array(command, argv, errp);
|
||||
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,
|
||||
errp));
|
||||
if (!ioc) {
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user