Re: [Qemu-devel] [PATCH v3 13/27] migration: convert tcp socket protocol to use QIOChannel

[Dr. David Alan Gilbert]

* Daniel P. Berrange (address@hidden) wrote:
> Drop the current TCP socket migration driver and extend
> the new generic socket driver to cope with the TCP address
> format
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/Makefile.objs |   2 +-
>  migration/socket.c      |  31 +++++++++++++++
>  migration/tcp.c         | 103 
> ------------------------------------------------
>  3 files changed, 32 insertions(+), 104 deletions(-)
>  delete mode 100644 migration/tcp.c
> 
> diff --git a/migration/Makefile.objs b/migration/Makefile.objs
> index 9d83997..59e8c09 100644
> --- a/migration/Makefile.objs
> +++ b/migration/Makefile.objs
> @@ -1,4 +1,4 @@
> -common-obj-y += migration.o tcp.o socket.o
> +common-obj-y += migration.o socket.o
>  common-obj-y += vmstate.o
>  common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o 
> qemu-file-stdio.o
>  common-obj-y += qemu-file-channel.o
> diff --git a/migration/socket.c b/migration/socket.c
> index ef0a673..7e0d9ee 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -24,6 +24,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 = iaddr;
> +
> +    return saddr;
> +}
> +
> +
>  static SocketAddress *unix_build_address(const char *path)
>  {
>      SocketAddress *saddr;
> @@ -68,6 +85,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)
> @@ -124,6 +149,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);
> diff --git a/migration/tcp.c b/migration/tcp.c
> deleted file mode 100644
> index 48904e0..0000000
> --- a/migration/tcp.c
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -/*
> - * QEMU live migration
> - *
> - * Copyright IBM, Corp. 2008
> - *
> - * Authors:
> - *  Anthony Liguori   <address@hidden>
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2.  See
> - * the COPYING file in the top-level directory.
> - *
> - * Contributions after 2012-01-13 are licensed under the terms of the
> - * GNU GPL, version 2 or (at your option) any later version.
> - */
> -
> -#include "qemu/osdep.h"
> -
> -#include "qemu-common.h"
> -#include "qemu/error-report.h"
> -#include "qemu/sockets.h"
> -#include "migration/migration.h"
> -#include "migration/qemu-file.h"
> -#include "block/block.h"
> -#include "qemu/main-loop.h"
> -
> -//#define DEBUG_MIGRATION_TCP
> -
> -#ifdef DEBUG_MIGRATION_TCP
> -#define DPRINTF(fmt, ...) \
> -    do { printf("migration-tcp: " fmt, ## __VA_ARGS__); } while (0)
> -#else
> -#define DPRINTF(fmt, ...) \
> -    do { } while (0)
> -#endif
> -
> -static void tcp_wait_for_connect(int fd, Error *err, void *opaque)
> -{
> -    MigrationState *s = opaque;
> -
> -    if (fd < 0) {
> -        DPRINTF("migrate connect error: %s\n", error_get_pretty(err));
> -        s->to_dst_file = NULL;
> -        migrate_fd_error(s, err);
> -    } else {
> -        DPRINTF("migrate connect success\n");
> -        s->to_dst_file = qemu_fopen_socket(fd, "wb");
> -        migrate_fd_connect(s);
> -    }
> -}
> -
> -void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, 
> Error **errp)
> -{
> -    inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, errp);
> -}
> -
> -static void tcp_accept_incoming_migration(void *opaque)
> -{
> -    struct sockaddr_in addr;
> -    socklen_t addrlen = sizeof(addr);
> -    int s = (intptr_t)opaque;
> -    QEMUFile *f;
> -    int c, err;
> -
> -    do {
> -        c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
> -        err = socket_error();
> -    } while (c < 0 && err == EINTR);
> -    qemu_set_fd_handler(s, NULL, NULL, NULL);
> -    closesocket(s);
> -
> -    DPRINTF("accepted migration\n");
> -
> -    if (c < 0) {
> -        error_report("could not accept migration connection (%s)",
> -                     strerror(err));
> -        return;
> -    }
> -
> -    f = qemu_fopen_socket(c, "rb");
> -    if (f == NULL) {
> -        error_report("could not qemu_fopen socket");
> -        goto out;
> -    }
> -
> -    process_incoming_migration(f);
> -    return;
> -
> -out:
> -    closesocket(c);
> -}
> -
> -void tcp_start_incoming_migration(const char *host_port, Error **errp)
> -{
> -    int s;
> -
> -    s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0, errp);
> -    if (s < 0) {
> -        return;
> -    }
> -
> -    qemu_set_fd_handler(s, tcp_accept_incoming_migration, NULL,
> -                        (void *)(intptr_t)s);
> -}
> -- 
> 2.5.0
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK