aboutsummaryrefslogtreecommitdiff
path: root/chardev
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-02-06 18:43:23 +0100
committerMarc-André Lureau <marcandre.lureau@redhat.com>2019-02-13 15:36:14 +0100
commit3d9e232240f9d029d7255b5b11d3a2f61c53d0d0 (patch)
tree4a62cd65b664caad8132f4156d77097ddc871483 /chardev
parent129263c6c08407747753c0c1f715917107cbcb3f (diff)
char: update the mux handlers in class callback
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 <marcandre.lureau@redhat.com> Message-Id: <20190206174328.9736-2-marcandre.lureau@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'chardev')
-rw-r--r--chardev/char-fe.c4
-rw-r--r--chardev/char-mux.c5
2 files changed, 3 insertions, 6 deletions
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 = {