From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDhg7-0005BE-V4 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 20:30:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDhg2-0006Hh-8L for qemu-devel@nongnu.org; Thu, 16 Jun 2016 20:30:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDhg2-0006Hd-0T for qemu-devel@nongnu.org; Thu, 16 Jun 2016 20:30:26 -0400 Date: Fri, 17 Jun 2016 03:30:22 +0300 From: "Michael S. Tsirkin" Message-ID: <20160617033022-mutt-send-email-mst@redhat.com> References: <1466123354-22896-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1466123354-22896-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v3 05/15] qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Tetsuya Mukawa , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Yuanhan Liu , Victor Kaplansky , Paolo Bonzini From: Tetsuya Mukawa The patch introduces qemu_chr_disconnect(). The function is used for closing a fd accepted by listen fd. Though we already have qemu_chr_delet= e(), but it closes not only accepted fd but also listen fd. This new function is used when we still want to keep listen fd. Signed-off-by: Tetsuya Mukawa Reviewed-by: Marc-Andr=E9 Lureau Tested-by: Yuanhan Liu Reviewed-by: Yuanhan Liu Reviewed-by: Victor Kaplansky Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/sysemu/char.h | 7 +++++++ qemu-char.c | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index 372a6fd..1eb2d0f 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -75,6 +75,7 @@ struct CharDriverState { IOReadHandler *chr_read; void *handler_opaque; void (*chr_close)(struct CharDriverState *chr); + void (*chr_disconnect)(struct CharDriverState *chr); void (*chr_accept_input)(struct CharDriverState *chr); void (*chr_set_echo)(struct CharDriverState *chr, bool echo); void (*chr_set_fe_open)(struct CharDriverState *chr, int fe_open); @@ -143,6 +144,12 @@ void qemu_chr_parse_common(QemuOpts *opts, ChardevCo= mmon *backend); */ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*init)(struct CharDriverState *s)); +/** + * @qemu_chr_disconnect: + * + * Close a fd accpeted by character backend. + */ +void qemu_chr_disconnect(CharDriverState *chr); =20 /** * @qemu_chr_new_noreplay: diff --git a/qemu-char.c b/qemu-char.c index b13ecbb..e312777 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4012,6 +4012,13 @@ void qemu_chr_fe_release(CharDriverState *s) s->avail_connections++; } =20 +void qemu_chr_disconnect(CharDriverState *chr) +{ + if (chr->chr_disconnect) { + chr->chr_disconnect(chr); + } +} + static void qemu_chr_free_common(CharDriverState *chr) { g_free(chr->filename); @@ -4389,6 +4396,7 @@ static CharDriverState *qmp_chardev_open_socket(con= st char *id, chr->chr_write =3D tcp_chr_write; chr->chr_sync_read =3D tcp_chr_sync_read; chr->chr_close =3D tcp_chr_close; + chr->chr_disconnect =3D tcp_chr_disconnect; chr->get_msgfds =3D tcp_get_msgfds; chr->set_msgfds =3D tcp_set_msgfds; chr->chr_add_client =3D tcp_chr_add_client; --=20 MST