Re: [Qemu-devel] [PATCH 09/12] migration: close socket QEMUFile from socket_close

[Orit Wasserman]

On 10/18/2012 12:22 PM, Paolo Bonzini wrote:
> The common suffix now is process_incoming_migration+qemu_fclose.
> 
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  migration-tcp.c  | 2 ++
>  migration-unix.c | 2 ++
>  savevm.c         | 1 +
>  3 file modificati, 5 inserzioni(+)
> 
> diff --git a/migration-tcp.c b/migration-tcp.c
> index 07715de..463f7f6 100644
> --- a/migration-tcp.c
> +++ b/migration-tcp.c
> @@ -111,6 +111,8 @@ static void tcp_accept_incoming_migration(void *opaque)
>  
>      process_incoming_migration(f);
>      qemu_fclose(f);
> +    return;
> +
>  out:
>      closesocket(c);
>  }
> diff --git a/migration-unix.c b/migration-unix.c
> index def1969..46e04fc 100644
> --- a/migration-unix.c
> +++ b/migration-unix.c
> @@ -144,6 +144,8 @@ static void unix_accept_incoming_migration(void *opaque)
>  
>      process_incoming_migration(f);
>      qemu_fclose(f);
> +    return;
> +
>  out:
>      close(c);
>  }
> diff --git a/savevm.c b/savevm.c
> index 7eca28b..ae5e617 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -212,6 +212,7 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, 
> int64_t pos, int size)
>  static int socket_close(void *opaque)
>  {
>      QEMUFileSocket *s = opaque;
> +    closesocket(s->fd);
>      g_free(s);
>      return 0;
>  }
> 
Reviewed-by: Orit Wasserman <address@hidden>