From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33703)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1X33SN-0006X9-Tp
	for qemu-devel@nongnu.org; Fri, 04 Jul 2014 09:23:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1X33SI-0003V2-6s
	for qemu-devel@nongnu.org; Fri, 04 Jul 2014 09:23:15 -0400
Received: from mail-qc0-x233.google.com ([2607:f8b0:400d:c01::233]:62173)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1X33SI-0003Uy-2V
	for qemu-devel@nongnu.org; Fri, 04 Jul 2014 09:23:10 -0400
Received: by mail-qc0-f179.google.com with SMTP id x3so1479872qcv.24
	for <qemu-devel@nongnu.org>; Fri, 04 Jul 2014 06:23:09 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <53B6AAB9.9030307@redhat.com>
Date: Fri, 04 Jul 2014 15:23:05 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1404477795-1067-1-git-send-email-batuzovk@ispras.ru>
In-Reply-To: <1404477795-1067-1-git-send-email-batuzovk@ispras.ru>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qemu-char: add chr_add_watch support in
	mux chardev
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kirill Batuzov <batuzovk@ispras.ru>, qemu-devel@nongnu.org
Cc: "Michael S . Tsirkin" <mst@redhat.com>, Luiz Capitulino <lcapitulino@redhat.com>

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