* [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in mux chardev
@ 2014-07-04 12:43 Kirill Batuzov
2014-07-04 13:23 ` Paolo Bonzini
2014-07-06 5:42 ` Michael S. Tsirkin
0 siblings, 2 replies; 3+ messages in thread
From: Kirill Batuzov @ 2014-07-04 12:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Luiz Capitulino, Michael S . Tsirkin, Kirill Batuzov
Forward chr_add_watch call from mux chardev to underlying
implementation.
This should fix bug #1335444
Signed-off-by: Kirill Batuzov <batuzovk@ispras.ru>
---
qemu-char.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/qemu-char.c b/qemu-char.c
index 51917de..e1bd6f5 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
*/
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in mux chardev
2014-07-04 12:43 [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in mux chardev Kirill Batuzov
@ 2014-07-04 13:23 ` Paolo Bonzini
2014-07-06 5:42 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2014-07-04 13:23 UTC (permalink / raw)
To: Kirill Batuzov, qemu-devel; +Cc: Michael S . Tsirkin, Luiz Capitulino
Il 04/07/2014 14:43, Kirill Batuzov ha scritto:
> Forward chr_add_watch call from mux chardev to underlying
> implementation.
>
> This should fix bug #1335444
>
> Signed-off-by: Kirill Batuzov <batuzovk@ispras.ru>
> ---
> qemu-char.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index 51917de..e1bd6f5 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
> */
>
Thanks, looks good.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in mux chardev
2014-07-04 12:43 [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in mux chardev Kirill Batuzov
2014-07-04 13:23 ` Paolo Bonzini
@ 2014-07-06 5:42 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2014-07-06 5:42 UTC (permalink / raw)
To: Kirill Batuzov; +Cc: qemu-devel, Luiz Capitulino
On Fri, Jul 04, 2014 at 04:43:15PM +0400, Kirill Batuzov wrote:
> Forward chr_add_watch call from mux chardev to underlying
> implementation.
>
> This should fix bug #1335444
>
> Signed-off-by: Kirill Batuzov <batuzovk@ispras.ru>
Applied for this once, but please note 2.1 patches
need to be tagged explicitly from now on.
> ---
> qemu-char.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index 51917de..e1bd6f5 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
> */
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-06 6:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-04 12:43 [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in mux chardev Kirill Batuzov
2014-07-04 13:23 ` Paolo Bonzini
2014-07-06 5:42 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).