Commit cdaa86a5 authored by Nikolay Nikolaev's avatar Nikolay Nikolaev Committed by Michael S. Tsirkin
Browse files

Add G_IO_HUP handler for socket chardev 



This is used to detect that the remote end has disconnected. Just call
tcp_char_disconnect on receiving this event.

Signed-off-by: default avatarAntonios Motakis <a.motakis@virtualopensystems.com>
Signed-off-by: default avatarNikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c76bf6bb

include/sysemu/char.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ struct CharDriverState { 
    int avail_connections;

    int is_mux;

    guint fd_in_tag;

    guint fd_hup_tag;

    QemuOpts *opts;

    QTAILQ_ENTRY(CharDriverState) next;

};

qemu-char.c

+21 −0
Original line number Diff line number Diff line
@@ -2680,6 +2680,25 @@ CharDriverState *qemu_chr_open_eventfd(int eventfd) 
}

#endif



static gboolean tcp_chr_chan_close(GIOChannel *channel, GIOCondition cond,

                                   void *opaque)

{

    CharDriverState *chr = opaque;



    if (cond != G_IO_HUP) {

        return FALSE;

    }



    /* connection closed */

    tcp_chr_disconnect(chr);

    if (chr->fd_hup_tag) {

        g_source_remove(chr->fd_hup_tag);

        chr->fd_hup_tag = 0;

    }



    return TRUE;

}



static void tcp_chr_connect(void *opaque)

{

    CharDriverState *chr = opaque;
@@ -2689,6 +2708,8 @@ static void tcp_chr_connect(void *opaque) 
    if (s->chan) {

        chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll,

                                           tcp_chr_read, chr);

        chr->fd_hup_tag = g_io_add_watch(s->chan, G_IO_HUP, tcp_chr_chan_close,

                                         chr);

    }

    qemu_chr_be_generic_open(chr);

}