From 3f0838ab8557c6071a5931183b2d7fed568cd35c Mon Sep 17 00:00:00 2001 From: Kirill Batuzov Date: Fri, 4 Jul 2014 16:43:15 +0400 Subject: [PATCH] qemu-char: add chr_add_watch support in mux chardev Forward chr_add_watch call from mux chardev to underlying implementation. This should fix bug #1335444 Signed-off-by: Kirill Batuzov Acked-by: Paolo Bonzini Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- qemu-char.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 22a9777f49..55e372cf32 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -581,6 +581,12 @@ static Notifier muxes_realize_notify = { .notify = muxes_realize_done, }; +static GSource *mux_chr_add_watch(CharDriverState *s, GIOCondition cond) +{ + MuxDriver *d = s->opaque; + return d->drv->chr_add_watch(d->drv, cond); +} + static CharDriverState *qemu_chr_open_mux(CharDriverState *drv) { CharDriverState *chr; @@ -597,6 +603,9 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv) chr->chr_accept_input = mux_chr_accept_input; /* Frontend guest-open / -close notification is not support with muxes */ chr->chr_set_fe_open = NULL; + if (drv->chr_add_watch) { + chr->chr_add_watch = mux_chr_add_watch; + } /* only default to opened state if we've realized the initial * set of muxes */ -- 2.11.4.GIT