From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxLL-0005bD-Ii for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:38:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwxLF-00047A-QU for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:38:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxLF-00044s-HJ for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:38:41 -0400 Date: Tue, 17 Jun 2014 20:39:03 +0300 From: "Michael S. Tsirkin" Message-ID: <1403021756-15960-49-git-send-email-mst@redhat.com> References: <1403021756-15960-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403021756-15960-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 048/103] Add G_IO_HUP handler for socket chardev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Michael Roth , Nikolay Nikolaev , Gerd Hoffmann , Anthony Liguori , Antonios Motakis From: Nikolay Nikolaev 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 Signed-off-by: Nikolay Nikolaev Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 5cff333..086ee8f 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); } -- MST