diff options
author | Stratos Psomadakis <psomas@grnet.gr> | 2014-09-15 15:34:57 +0300 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-09-26 13:14:10 -0400 |
commit | e5554e2015f8fb452135f7b1ce1976536266379c (patch) | |
tree | fdc653f3d8f94477ee25b3cb1c4779dabe8c1426 /monitor.c | |
parent | 81ab11a7a524d12412a59ef49c6b270671e62ea0 (diff) | |
download | hqemu-e5554e2015f8fb452135f7b1ce1976536266379c.zip hqemu-e5554e2015f8fb452135f7b1ce1976536266379c.tar.gz |
monitor: Reset HMP mon->rs in CHR_EVENT_OPEN
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>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5249,6 +5249,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; |