Re: [Qemu-devel] [PATCH resend v2 1/2] monitor: Reset HMP mon->rs in CHR_EVENT_OPEN

[Luiz Capitulino <lcapitulino@redhat.com>]

On Mon, 15 Sep 2014 15:34:57 +0300
Stratos Psomadakis <psomas@grnet.gr> wrote:

> Commit cdaa86a54 ("Add G_IO_HUP handler for socket chardev") exposed a bug in
> the way the HMP monitor handles its command buffer. When a client closes the
> connection to the monitor, tcp_chr_read() will detect the G_IO_HUP condition
> and call tcp_chr_disconnect() to close the server-side connection too. Due to
> the fact that monitor reads 1 byte at a time (for each tcp_chr_read()), the
> monitor readline state / buffers might contain junk (i.e. a half-finished
> command). Thus, without calling readline_restart() on mon->rs in
> CHR_EVENT_OPEN, future HMP commands will fail.
> 
> Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
> Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

Applied to the qmp branch, thanks.

> ---
>  monitor.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/monitor.c b/monitor.c
> index 34cee74..fb266bc 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -5245,6 +5245,7 @@ static void monitor_event(void *opaque, int event)
>          monitor_printf(mon, "QEMU %s monitor - type 'help' for more "
>                         "information\n", QEMU_VERSION);
>          if (!mon->mux_out) {
> +            readline_restart(mon->rs);
>              readline_show_prompt(mon->rs);
>          }
>          mon->reset_seen = 1;