[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 21/25] char: update the mux handlers in class call
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL v2 21/25] char: update the mux handlers in class callback |
Date: |
Wed, 13 Feb 2019 17:19:09 +0100 |
Instead of handling mux chardev in a special way in
qemu_chr_fe_set_handlers(), we may use the chr_update_read_handler
class callback instead.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
include/chardev/char-mux.h | 1 -
chardev/char-fe.c | 4 ----
chardev/char-mux.c | 5 +++--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/include/chardev/char-mux.h b/include/chardev/char-mux.h
index 1e13187767..572cefd517 100644
--- a/include/chardev/char-mux.h
+++ b/include/chardev/char-mux.h
@@ -55,7 +55,6 @@ typedef struct MuxChardev {
#define CHARDEV_IS_MUX(chr) \
object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX)
-void mux_chr_set_handlers(Chardev *chr, GMainContext *context);
void mux_set_focus(Chardev *chr, int focus);
void mux_chr_send_all_event(Chardev *chr, int event);
diff --git a/chardev/char-fe.c b/chardev/char-fe.c
index b7bcbd59c0..f3530a90e6 100644
--- a/chardev/char-fe.c
+++ b/chardev/char-fe.c
@@ -290,10 +290,6 @@ void qemu_chr_fe_set_handlers_full(CharBackend *b,
qemu_chr_be_event(s, CHR_EVENT_OPENED);
}
}
-
- if (CHARDEV_IS_MUX(s)) {
- mux_chr_set_handlers(s, context);
- }
}
void qemu_chr_fe_set_handlers(CharBackend *b,
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 1199d32674..23aa82125d 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -278,7 +278,7 @@ static void char_mux_finalize(Object *obj)
qemu_chr_fe_deinit(&d->chr, false);
}
-void mux_chr_set_handlers(Chardev *chr, GMainContext *context)
+static void mux_chr_update_read_handlers(Chardev *chr)
{
MuxChardev *d = MUX_CHARDEV(chr);
@@ -289,7 +289,7 @@ void mux_chr_set_handlers(Chardev *chr, GMainContext
*context)
mux_chr_event,
NULL,
chr,
- context, true, false);
+ chr->gcontext, true, false);
}
void mux_set_focus(Chardev *chr, int focus)
@@ -383,6 +383,7 @@ static void char_mux_class_init(ObjectClass *oc, void *data)
cc->chr_add_watch = mux_chr_add_watch;
cc->chr_be_event = mux_chr_be_event;
cc->chr_machine_done = open_muxes;
+ cc->chr_update_read_handler = mux_chr_update_read_handlers;
}
static const TypeInfo char_mux_type_info = {
--
2.21.0.rc0.1.g036caf7885
- [Qemu-devel] [PULL v2 12/25] chardev: split up qmp_chardev_open_socket connection code, (continued)
- [Qemu-devel] [PULL v2 12/25] chardev: split up qmp_chardev_open_socket connection code, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 11/25] chardev: split tcp_chr_wait_connected into two methods, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 14/25] chardev: honour the reconnect setting in tcp_chr_wait_connected, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 13/25] chardev: use a state machine for socket connection state, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 15/25] chardev: disallow TLS/telnet/websocket with tcp_chr_wait_connected, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 18/25] chardev: ensure termios is fully initialized, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 16/25] chardev: fix race with client connections in tcp_chr_wait_connected, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 17/25] tests: expand coverage of socket chardev test, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 20/25] chardev/wctablet: Fix a typo, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 22/25] terminal3270: do not use backend timer sources, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 21/25] char: update the mux handlers in class callback,
Marc-André Lureau <=
- [Qemu-devel] [PULL v2 19/25] char: allow specifying a GMainContext at opening time, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 23/25] chardev: add a note about frontend sources and context switch, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 24/25] char-pty: remove the check for connection on write, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 25/25] char-pty: remove write_lock usage, Marc-André Lureau, 2019/02/13
- Re: [Qemu-devel] [PULL v2 00/25] Chardev patches, Peter Maydell, 2019/02/14