[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 05/18] Add G_IO_HUP handler for socket chardev
From: |
Nikolay Nikolaev |
Subject: |
[Qemu-devel] [PATCH v10 05/18] Add G_IO_HUP handler for socket chardev |
Date: |
Tue, 27 May 2014 15:04:28 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This is used to detect that the remote end has disconnected. Just call
tcp_char_disconnect on receiving this event.
Signed-off-by: Antonios Motakis <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
include/sysemu/char.h | 1 +
qemu-char.c | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index 82eaaf5..f14ab06 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -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;
};
diff --git a/qemu-char.c b/qemu-char.c
index e5c1cf9..c18899e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2674,6 +2674,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;
@@ -2683,6 +2702,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);
}
- [Qemu-devel] [PATCH v10 00/18] Vhost and vhost-net support for userspace based backends, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 01/18] Add kvm_eventfds_enabled function, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 02/18] Add chardev API qemu_chr_fe_read_all, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 03/18] Add chardev API qemu_chr_fe_set_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 04/18] Add chardev API qemu_chr_fe_get_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 05/18] Add G_IO_HUP handler for socket chardev,
Nikolay Nikolaev <=
- [Qemu-devel] [PATCH v10 06/18] vhost: add vhost_get_features and vhost_ack_features, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 07/18] vhost_net should call the poll callback only when it is set, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 08/18] Refactor virtio-net to use generic get_vhost_net, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 09/18] vhost_net_init will use VhostNetOptions to get all its arguments, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 10/18] Add vhost_ops to vhost_dev struct and replace all relevant ioctls, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 12/18] Add vhost-user as a vhost backend., Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 13/18] vhost-net: vhost-user feature bits support, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 14/18] Add new vhost-user netdev backend, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 15/18] Add the vhost-user netdev backend to the command line, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 16/18] Add vhost-user protocol documentation, Nikolay Nikolaev, 2014/05/27