From e65c67e4dad18a1f04be426f23cc4d64a32c7548 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 27 Apr 2016 11:05:04 +0100 Subject: migration: convert tcp socket protocol to use QIOChannel Drop the current TCP socket migration driver and extend the new generic socket driver to cope with the TCP address format Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrange Message-Id: <1461751518-12128-15-git-send-email-berrange@redhat.com> Signed-off-by: Amit Shah --- migration/socket.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'migration/socket.c') diff --git a/migration/socket.c b/migration/socket.c index a9911d6..25457ea 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -25,6 +25,23 @@ #include "trace.h" +static SocketAddress *tcp_build_address(const char *host_port, Error **errp) +{ + InetSocketAddress *iaddr = inet_parse(host_port, errp); + SocketAddress *saddr; + + if (!iaddr) { + return NULL; + } + + saddr = g_new0(SocketAddress, 1); + saddr->type = SOCKET_ADDRESS_KIND_INET; + saddr->u.inet.data = iaddr; + + return saddr; +} + + static SocketAddress *unix_build_address(const char *path) { SocketAddress *saddr; @@ -69,6 +86,14 @@ static void socket_start_outgoing_migration(MigrationState *s, qapi_free_SocketAddress(saddr); } +void tcp_start_outgoing_migration(MigrationState *s, + const char *host_port, + Error **errp) +{ + SocketAddress *saddr = tcp_build_address(host_port, errp); + socket_start_outgoing_migration(s, saddr, errp); +} + void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) @@ -125,6 +150,12 @@ static void socket_start_incoming_migration(SocketAddress *saddr, qapi_free_SocketAddress(saddr); } +void tcp_start_incoming_migration(const char *host_port, Error **errp) +{ + SocketAddress *saddr = tcp_build_address(host_port, errp); + socket_start_incoming_migration(saddr, errp); +} + void unix_start_incoming_migration(const char *path, Error **errp) { SocketAddress *saddr = unix_build_address(path); -- cgit v1.1