From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTVVp-0000cK-I8 for qemu-devel@nongnu.org; Mon, 15 Sep 2014 08:36:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XTVVi-0001b2-H4 for qemu-devel@nongnu.org; Mon, 15 Sep 2014 08:36:09 -0400 From: Stratos Psomadakis Date: Mon, 15 Sep 2014 15:34:57 +0300 Message-Id: <1410784497-18866-1-git-send-email-psomas@grnet.gr> In-Reply-To: <20140913212349.5fb6ca1d@redhat.com> References: <20140913212349.5fb6ca1d@redhat.com> Subject: [Qemu-devel] [PATCH resend v2 1/2] monitor: Reset HMP mon->rs in CHR_EVENT_OPEN List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: lcapitulino@redhat.com Cc: synnefo-devel@googlegroups.com, qemu-devel@nongnu.org, armbru@redhat.com, qemu-stable@nongnu.org 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 Signed-off-by: Dimitris Aragiorgis --- 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; -- 1.7.10.4