OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: unify the framework of socket-type channel

Browse Source 
Currently, the only difference of tcp channel and unix channel in
migration/socket.c is the way to build SocketAddress, but socket_parse()
can handle these two types, so use it to instead of tcp_build_address()
and unix_build_address().

The socket-type channel can be further unified based on the up, this
would be helpful for us to add other socket-type channels.

Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Message-Id: <20200806074030.174-2-longpeng2@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Longpeng(Mike) 2020-08-06 15:40:29 +08:00 committed by Dr. David Alan Gilbert
parent 3e39dac035
commit d658f65c16
3 changed files with 26 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
migration/migration.c
View File

@ -378,21 +378,20 @@ void migrate_add_address(SocketAddress *address)
void qemu_start_incoming_migration(const char *uri, Error **errp) void qemu_start_incoming_migration(const char *uri, Error **errp)
{ {
const char *p; const char *p = NULL;
qapi_event_send_migration(MIGRATION_STATUS_SETUP); qapi_event_send_migration(MIGRATION_STATUS_SETUP);
if (!strcmp(uri, "defer")) { if (!strcmp(uri, "defer")) {
deferred_incoming_migration(errp); deferred_incoming_migration(errp);
} else if (strstart(uri, "tcp:", &p)) { } else if (strstart(uri, "tcp:", &p) ||
tcp_start_incoming_migration(p, errp); strstart(uri, "unix:", NULL)) {
socket_start_incoming_migration(p ? p : uri, errp);
#ifdef CONFIG_RDMA #ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) { } else if (strstart(uri, "rdma:", &p)) {
rdma_start_incoming_migration(p, errp); rdma_start_incoming_migration(p, errp);
#endif #endif
} else if (strstart(uri, "exec:", &p)) { } else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp); exec_start_incoming_migration(p, errp);
} else if (strstart(uri, "unix:", &p)) {
unix_start_incoming_migration(p, errp);
} else if (strstart(uri, "fd:", &p)) { } else if (strstart(uri, "fd:", &p)) {
fd_start_incoming_migration(p, errp); fd_start_incoming_migration(p, errp);
} else { } else {
@ -2094,7 +2093,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
{ {
Error *local_err = NULL; Error *local_err = NULL;
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
const char *p; const char *p = NULL;
if (!migrate_prepare(s, has_blk && blk, has_inc && inc, if (!migrate_prepare(s, has_blk && blk, has_inc && inc,
has_resume && resume, errp)) { has_resume && resume, errp)) {
@ -2102,16 +2101,15 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
return; return;
} }
if (strstart(uri, "tcp:", &p)) { if (strstart(uri, "tcp:", &p) ||
tcp_start_outgoing_migration(s, p, &local_err); strstart(uri, "unix:", NULL)) {
socket_start_outgoing_migration(s, p ? p : uri, &local_err);
#ifdef CONFIG_RDMA #ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) { } else if (strstart(uri, "rdma:", &p)) {
rdma_start_outgoing_migration(s, p, &local_err); rdma_start_outgoing_migration(s, p, &local_err);
#endif #endif
} else if (strstart(uri, "exec:", &p)) { } else if (strstart(uri, "exec:", &p)) {
exec_start_outgoing_migration(s, p, &local_err); exec_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "unix:", &p)) {
unix_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "fd:", &p)) { } else if (strstart(uri, "fd:", &p)) {
fd_start_outgoing_migration(s, p, &local_err); fd_start_outgoing_migration(s, p, &local_err);
} else { } else {

72
migration/socket.c
View File

@ -50,34 +50,6 @@ int socket_send_channel_destroy(QIOChannel *send)
return 0; return 0;
} }
static SocketAddress *tcp_build_address(const char *host_port, Error **errp)
{
SocketAddress *saddr;
saddr = g_new0(SocketAddress, 1);
saddr->type = SOCKET_ADDRESS_TYPE_INET;
if (inet_parse(&saddr->u.inet, host_port, errp)) {
qapi_free_SocketAddress(saddr);
return NULL;
}
return saddr;
}
static SocketAddress *unix_build_address(const char *path)
{
SocketAddress *saddr;
saddr = g_new0(SocketAddress, 1);
saddr->type = SOCKET_ADDRESS_TYPE_UNIX;
saddr->u.q_unix.path = g_strdup(path);
return saddr;
}
struct SocketConnectData { struct SocketConnectData {
MigrationState *s; MigrationState *s;
char *hostname; char *hostname;
@ -109,9 +81,10 @@ static void socket_outgoing_migration(QIOTask *task,
object_unref(OBJECT(sioc)); object_unref(OBJECT(sioc));
} }
static void socket_start_outgoing_migration(MigrationState *s, static void
SocketAddress *saddr, socket_start_outgoing_migration_internal(MigrationState *s,
Error **errp) SocketAddress *saddr,
Error **errp)
{ {
QIOChannelSocket *sioc = qio_channel_socket_new(); QIOChannelSocket *sioc = qio_channel_socket_new();
struct SocketConnectData *data = g_new0(struct SocketConnectData, 1); struct SocketConnectData *data = g_new0(struct SocketConnectData, 1);
@ -135,27 +108,18 @@ static void socket_start_outgoing_migration(MigrationState *s,
NULL); NULL);
} }
void tcp_start_outgoing_migration(MigrationState *s, void socket_start_outgoing_migration(MigrationState *s,
const char *host_port, const char *str,
Error **errp) Error **errp)
{ {
Error *err = NULL; Error *err = NULL;
SocketAddress *saddr = tcp_build_address(host_port, &err); SocketAddress *saddr = socket_parse(str, &err);
if (!err) { if (!err) {
socket_start_outgoing_migration(s, saddr, &err); socket_start_outgoing_migration_internal(s, saddr, &err);
} }
error_propagate(errp, err); error_propagate(errp, err);
} }
void unix_start_outgoing_migration(MigrationState *s,
const char *path,
Error **errp)
{
SocketAddress *saddr = unix_build_address(path);
socket_start_outgoing_migration(s, saddr, errp);
}
static void socket_accept_incoming_migration(QIONetListener *listener, static void socket_accept_incoming_migration(QIONetListener *listener,
QIOChannelSocket *cioc, QIOChannelSocket *cioc,
gpointer opaque) gpointer opaque)
@ -173,8 +137,9 @@ static void socket_accept_incoming_migration(QIONetListener *listener,
} }
static void socket_start_incoming_migration(SocketAddress *saddr, static void
Error **errp) socket_start_incoming_migration_internal(SocketAddress *saddr,
Error **errp)
{ {
QIONetListener *listener = qio_net_listener_new(); QIONetListener *listener = qio_net_listener_new();
size_t i; size_t i;
@ -207,20 +172,13 @@ static void socket_start_incoming_migration(SocketAddress *saddr,
} }
} }
void tcp_start_incoming_migration(const char *host_port, Error **errp) void socket_start_incoming_migration(const char *str, Error **errp)
{ {
Error *err = NULL; Error *err = NULL;
SocketAddress *saddr = tcp_build_address(host_port, &err); SocketAddress *saddr = socket_parse(str, &err);
if (!err) { if (!err) {
socket_start_incoming_migration(saddr, &err); socket_start_incoming_migration_internal(saddr, &err);
} }
qapi_free_SocketAddress(saddr); qapi_free_SocketAddress(saddr);
error_propagate(errp, err); error_propagate(errp, err);
} }
void unix_start_incoming_migration(const char *path, Error **errp)
{
SocketAddress *saddr = unix_build_address(path);
socket_start_incoming_migration(saddr, errp);
qapi_free_SocketAddress(saddr);
}

11
migration/socket.h
View File

@ -23,13 +23,8 @@
void socket_send_channel_create(QIOTaskFunc f, void *data); void socket_send_channel_create(QIOTaskFunc f, void *data);
int socket_send_channel_destroy(QIOChannel *send); int socket_send_channel_destroy(QIOChannel *send);
void tcp_start_incoming_migration(const char *host_port, Error **errp); void socket_start_incoming_migration(const char *str, Error **errp);
void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, void socket_start_outgoing_migration(MigrationState *s, const char *str,
Error **errp); Error **errp);
void unix_start_incoming_migration(const char *path, Error **errp);
void unix_start_outgoing_migration(MigrationState *s, const char *path,
Error **errp);
#endif #endif