| Message ID | 20180827222322.26009-5-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | chardev: various cleanups and improvements | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> writes: > 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> In your subject, s/hanlders/handlers/.
Hi On Thu, Aug 30, 2018 at 4:58 PM Markus Armbruster <armbru@redhat.com> wrote: > > Marc-André Lureau <marcandre.lureau@redhat.com> writes: > > > 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> > > In your subject, s/hanlders/handlers/. oops, fixed does it get you r-b ? thanks
Marc-André Lureau <marcandre.lureau@gmail.com> writes: > Hi > > On Thu, Aug 30, 2018 at 4:58 PM Markus Armbruster <armbru@redhat.com> wrote: >> >> Marc-André Lureau <marcandre.lureau@redhat.com> writes: >> >> > 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> >> >> In your subject, s/hanlders/handlers/. > > oops, fixed > > does it get you r-b ? I haven't looked at the patch, yet :)
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 b1f228e8b5..6ed8bff46a 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -288,10 +288,6 @@ void qemu_chr_fe_set_handlers(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_take_focus(CharBackend *b) diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 6055e76293..9406eaf08d 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); + chr->gcontext, true); } 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 = {
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> --- include/chardev/char-mux.h | 1 - chardev/char-fe.c | 4 ---- chardev/char-mux.c | 5 +++-- 3 files changed, 3 insertions(+), 7 deletions(-)