Re: [Qemu-devel] [PATCH 07/19] migration: Export socket.c functions in its own file

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  include/migration/migration.h |  8 --------
>  include/migration/socket.h    | 25 +++++++++++++++++++++++++
>  migration/migration.c         |  1 +
>  migration/socket.c            |  1 +
>  4 files changed, 27 insertions(+), 8 deletions(-)
>  create mode 100644 include/migration/socket.h
> 
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index 077b75b..0c6dae5 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -194,14 +194,6 @@ void migration_tls_channel_connect(MigrationState *s,
>  
>  uint64_t migrate_max_downtime(void);
>  
> -void tcp_start_incoming_migration(const char *host_port, Error **errp);
> -
> -void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, 
> Error **errp);
> -
> -void unix_start_incoming_migration(const char *path, Error **errp);
> -
> -void unix_start_outgoing_migration(MigrationState *s, const char *path, 
> Error **errp);
> -
>  void rdma_start_outgoing_migration(void *opaque, const char *host_port, 
> Error **errp);
>  
>  void rdma_start_incoming_migration(const char *host_port, Error **errp);

Have you considered a header with just the transports in it?

There doesn't seem to be that much point with one with just the
rdma's in, and one iwth just the tcp's in etc.

Dave

> diff --git a/include/migration/socket.h b/include/migration/socket.h
> new file mode 100644
> index 0000000..800fde1
> --- /dev/null
> +++ b/include/migration/socket.h
> @@ -0,0 +1,25 @@
> +/*
> + * QEMU live migration socket functions
> + *
> + * 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.
> + *
> + */
> +
> +#ifndef QEMU_MIGRATION_SOCKET_H
> +#define QEMU_MIGRATION_SOCKET_H
> +void tcp_start_incoming_migration(const char *host_port, Error **errp);
> +
> +void tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
> +                                  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
> diff --git a/migration/migration.c b/migration/migration.c
> index a608faa..181839b 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -23,6 +23,7 @@
>  #include "migration/init.h"
>  #include "migration/exec.h"
>  #include "migration/fd.h"
> +#include "migration/socket.h"
>  #include "migration/migration.h"
>  #include "migration/qemu-file.h"
>  #include "sysemu/sysemu.h"
> diff --git a/migration/socket.c b/migration/socket.c
> index b06cde3..71a8439 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -20,6 +20,7 @@
>  #include "qemu/error-report.h"
>  #include "qapi/error.h"
>  #include "migration/channel.h"
> +#include "migration/socket.h"
>  #include "migration/migration.h"
>  #include "migration/qemu-file.h"
>  #include "io/channel-socket.h"
> -- 
> 2.9.3
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK