[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] qemu-char: add qemu_chr_disconnect to close a
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH 04/10] qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd |
Date: |
Tue, 10 May 2016 18:03:54 +0200 |
From: Tetsuya Mukawa <address@hidden>
The patch introduces qemu_chr_disconnect(). The function is used for
closing a fd accepted by listen fd. Though we already have qemu_chr_delete(),
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 <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
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 307fd8f..2c39987 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, ChardevCommon
*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);
/**
* @qemu_chr_new_noreplay:
diff --git a/qemu-char.c b/qemu-char.c
index b597ee1..6efbc0d 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4012,6 +4012,13 @@ void qemu_chr_fe_release(CharDriverState *s)
s->avail_connections++;
}
+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);
@@ -4405,6 +4412,7 @@ static CharDriverState *qmp_chardev_open_socket(const
char *id,
chr->chr_write = tcp_chr_write;
chr->chr_sync_read = tcp_chr_sync_read;
chr->chr_close = tcp_chr_close;
+ chr->chr_disconnect = tcp_chr_disconnect;
chr->get_msgfds = tcp_get_msgfds;
chr->set_msgfds = tcp_set_msgfds;
chr->chr_add_client = tcp_chr_add_client;
--
2.7.4
- [Qemu-devel] [PATCH 00/10] RFCv3: vhost-user: simple reconnection support, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 01/10] vhost-user: add ability to know vhost-user backend disconnection, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 03/10] vubr: workaround stale vring base, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 02/10] vubr: add client mode, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 04/10] qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd,
marcandre . lureau <=
- [Qemu-devel] [PATCH 09/10] tests: append i386 tests, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 05/10] vhost-user: disconnect on start failure, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 06/10] vhost-net: do not crash if backend is not present, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 08/10] vhost-net: save & restore vring enable state, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 07/10] vhost-net: save & restore vhost-user acked features, marcandre . lureau, 2016/05/10
- [Qemu-devel] [PATCH 10/10] test: start vhost-user reconnect test, marcandre . lureau, 2016/05/10
- Re: [Qemu-devel] [PATCH 00/10] RFCv3: vhost-user: simple reconnection support, Michael S. Tsirkin, 2016/05/10