Re: [Qemu-devel] [PATCH v2 05/10] 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>

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

> ---
>  include/migration/migration.h |  8 --------
>  migration/migration.c         |  1 +
>  migration/socket.c            |  1 +
>  migration/socket.h            | 28 ++++++++++++++++++++++++++++
>  4 files changed, 30 insertions(+), 8 deletions(-)
>  create mode 100644 migration/socket.h
> 
> diff --git a/include/migration/migration.h b/include/migration/migration.h
> index d249c13..9d311ed 100644
> --- a/include/migration/migration.h
> +++ b/include/migration/migration.h
> @@ -163,14 +163,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);
> diff --git a/migration/migration.c b/migration/migration.c
> index f3a1236..f5140d2 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -20,6 +20,7 @@
>  #include "migration/blocker.h"
>  #include "exec.h"
>  #include "fd.h"
> +#include "socket.h"
>  #include "migration/migration.h"
>  #include "savevm.h"
>  #include "qemu-file-channel.h"
> diff --git a/migration/socket.c b/migration/socket.c
> index 3f8ffc9..85bfdcc 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -20,6 +20,7 @@
>  #include "qemu/error-report.h"
>  #include "qapi/error.h"
>  #include "channel.h"
> +#include "socket.h"
>  #include "migration/migration.h"
>  #include "qemu-file.h"
>  #include "io/channel-socket.h"
> diff --git a/migration/socket.h b/migration/socket.h
> new file mode 100644
> index 0000000..6b91e9d
> --- /dev/null
> +++ b/migration/socket.h
> @@ -0,0 +1,28 @@
> +/*
> + * QEMU live migration via socket
> + *
> + * Copyright Red Hat, Inc. 2009-2016
> + *
> + * Authors:
> + *  Chris Lalancette <address@hidden>
> + *  Daniel P. Berrange <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.
> + */
> +
> +#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
> -- 
> 2.9.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK