提交 cdaa86a5 编写于 作者: N Nikolay Nikolaev 提交者: Michael S. Tsirkin

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: NAntonios Motakis <a.motakis@virtualopensystems.com>
Signed-off-by: NNikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 c76bf6bb
...@@ -83,6 +83,7 @@ struct CharDriverState { ...@@ -83,6 +83,7 @@ struct CharDriverState {
int avail_connections; int avail_connections;
int is_mux; int is_mux;
guint fd_in_tag; guint fd_in_tag;
guint fd_hup_tag;
QemuOpts *opts; QemuOpts *opts;
QTAILQ_ENTRY(CharDriverState) next; QTAILQ_ENTRY(CharDriverState) next;
}; };
......
...@@ -2680,6 +2680,25 @@ CharDriverState *qemu_chr_open_eventfd(int eventfd) ...@@ -2680,6 +2680,25 @@ CharDriverState *qemu_chr_open_eventfd(int eventfd)
} }
#endif #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) static void tcp_chr_connect(void *opaque)
{ {
CharDriverState *chr = opaque; CharDriverState *chr = opaque;
...@@ -2689,6 +2708,8 @@ static void tcp_chr_connect(void *opaque) ...@@ -2689,6 +2708,8 @@ static void tcp_chr_connect(void *opaque)
if (s->chan) { if (s->chan) {
chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll,
tcp_chr_read, chr); 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); qemu_chr_be_generic_open(chr);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册