On 10/18/2012 12:22 PM, Paolo Bonzini wrote:
> A first step towards making a common "suffix" for all migration protocols,
> and moving it to process_incoming_migration.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> migration-exec.c | 2 +-
> migration-fd.c | 2 +-
> migration-tcp.c | 7 +++----
> migration-unix.c | 7 +++----
> 4 file modificati, 8 inserzioni(+), 10 rimozioni(-)
>
> diff --git a/migration-exec.c b/migration-exec.c
> index f81e390..0964dbb 100644
> --- a/migration-exec.c
> +++ b/migration-exec.c
> @@ -97,8 +97,8 @@ static void exec_accept_incoming_migration(void *opaque)
> {
> QEMUFile *f = opaque;
>
> - process_incoming_migration(f);
> qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
> + process_incoming_migration(f);
> qemu_fclose(f);
> }
>
> diff --git a/migration-fd.c b/migration-fd.c
> index 43cc730..bb91e0a 100644
> --- a/migration-fd.c
> +++ b/migration-fd.c
> @@ -103,8 +103,8 @@ static void fd_accept_incoming_migration(void *opaque)
> {
> QEMUFile *f = opaque;
>
> - process_incoming_migration(f);
> qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
> + process_incoming_migration(f);
> qemu_fclose(f);
> }
>
> diff --git a/migration-tcp.c b/migration-tcp.c
> index a15c2b8..1bd8481 100644
> --- a/migration-tcp.c
> +++ b/migration-tcp.c
> @@ -96,12 +96,14 @@ static void tcp_accept_incoming_migration(void *opaque)
> do {
> c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
> } while (c == -1 && socket_error() == EINTR);
> + qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
> + close(s);
>
> DPRINTF("accepted migration\n");
>
> if (c == -1) {
> fprintf(stderr, "could not accept migration connection\n");
> - goto out2;
> + goto out;
> }
>
> f = qemu_fopen_socket(c);
> @@ -114,9 +116,6 @@ static void tcp_accept_incoming_migration(void *opaque)
> qemu_fclose(f);
> out:
> close(c);
> -out2:
> - qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
> - close(s);
> }
>
> int tcp_start_incoming_migration(const char *host_port, Error **errp)
> diff --git a/migration-unix.c b/migration-unix.c
> index 169de88..a407af2 100644
> --- a/migration-unix.c
> +++ b/migration-unix.c
> @@ -129,12 +129,14 @@ static void unix_accept_incoming_migration(void *opaque)
> do {
> c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen);
> } while (c == -1 && errno == EINTR);
> + qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
> + close(s);
>
> DPRINTF("accepted migration\n");
>
> if (c == -1) {
> fprintf(stderr, "could not accept migration connection\n");
> - goto out2;
> + goto out;
> }
>
> f = qemu_fopen_socket(c);
> @@ -147,9 +149,6 @@ static void unix_accept_incoming_migration(void *opaque)
> qemu_fclose(f);
> out:
> close(c);
> -out2:
> - qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
> - close(s);
> }
>
> int unix_start_incoming_migration(const char *path)
>
Reviewed-by: Orit Wasserman <owass...@redhat.com>
