Re: [Qemu-devel] [PATCH] fix monitor

[Hans de Goede]

Hi,

Looks good, one minor nitpick.

On 03/19/2013 10:57 AM, Gerd Hoffmann wrote:
> chardev flow control broke monitor, fix it by adding watch support.
> ---
>   monitor.c |   23 +++++++++++++++++++++--
>   1 file changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 112e920..680d344 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -261,11 +261,30 @@ int monitor_read_password(Monitor *mon, ReadLineFunc 
> *readline_func,
>       }
>   }
>
> +static gboolean monitor_unblocked(GIOChannel *chan, GIOCondition cond,
> +                                  void *opaque)
> +{
> +    monitor_flush(opaque);
> +    return FALSE;
> +}
> +
>   void monitor_flush(Monitor *mon)
>   {
> +    int rc;
> +
>       if (mon && mon->outbuf_index != 0 && !mon->mux_out) {
> -        qemu_chr_fe_write(mon->chr, mon->outbuf, mon->outbuf_index);
> -        mon->outbuf_index = 0;
> +        rc = qemu_chr_fe_write(mon->chr, mon->outbuf, mon->outbuf_index);
> +        if (rc == mon->outbuf_index) {
> +            /* all flushed */
> +            mon->outbuf_index = 0;
> +            return;
> +        }
> +        if (rc > 0) {
> +            /* partinal write */

Typo in the comment.

> +            memmove(mon->outbuf, mon->outbuf + rc, mon->outbuf_index - rc);
> +            mon->outbuf_index -= rc;
> +        }
> +        qemu_chr_fe_add_watch(mon->chr, G_IO_OUT, monitor_unblocked, mon);
>       }
>   }

Regards,

Hans