Re: [Qemu-devel] [PATCH 3/6] qemu-char: move pty_chr_update_read_handler around

[Fam Zheng <famz@redhat.com>]

On Tue, 06/03 18:39, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Fam Zheng <famz@redhat.com>

> ---
>  qemu-char.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/qemu-char.c b/qemu-char.c
> index 2bda2fb..b478a3d 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -1055,6 +1055,22 @@ static void pty_chr_rearm_timer(CharDriverState *chr, int ms)
>      }
>  }
>  
> +static void pty_chr_update_read_handler(CharDriverState *chr)
> +{
> +    PtyCharDriver *s = chr->opaque;
> +    GPollFD pfd;
> +
> +    pfd.fd = g_io_channel_unix_get_fd(s->fd);
> +    pfd.events = G_IO_OUT;
> +    pfd.revents = 0;
> +    g_poll(&pfd, 1, 0);
> +    if (pfd.revents & G_IO_HUP) {
> +        pty_chr_state(chr, 0);
> +    } else {
> +        pty_chr_state(chr, 1);
> +    }
> +}
> +
>  static int pty_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
>  {
>      PtyCharDriver *s = chr->opaque;
> @@ -1107,22 +1123,6 @@ static gboolean pty_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
>      return TRUE;
>  }
>  
> -static void pty_chr_update_read_handler(CharDriverState *chr)
> -{
> -    PtyCharDriver *s = chr->opaque;
> -    GPollFD pfd;
> -
> -    pfd.fd = g_io_channel_unix_get_fd(s->fd);
> -    pfd.events = G_IO_OUT;
> -    pfd.revents = 0;
> -    g_poll(&pfd, 1, 0);
> -    if (pfd.revents & G_IO_HUP) {
> -        pty_chr_state(chr, 0);
> -    } else {
> -        pty_chr_state(chr, 1);
> -    }
> -}
> -
>  static void pty_chr_state(CharDriverState *chr, int connected)
>  {
>      PtyCharDriver *s = chr->opaque;
> -- 
> 1.8.3.1
> 
>