From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlfV0-0005aC-CK for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlfUu-0005WN-SK for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:24 -0400 Received: from [199.232.76.173] (port=49342 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlfUt-0005WC-Vb for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64186) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlfUt-0007Yi-7s for qemu-devel@nongnu.org; Thu, 10 Sep 2009 04:59:19 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A8xIKQ021017 for ; Thu, 10 Sep 2009 04:59:18 -0400 From: Gerd Hoffmann Date: Thu, 10 Sep 2009 10:58:54 +0200 Message-Id: <1252573135-27688-23-git-send-email-kraxel@redhat.com> In-Reply-To: <1252573135-27688-1-git-send-email-kraxel@redhat.com> References: <1252573135-27688-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 22/23] monitor: fix muxing List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann make the mux driver send mux_in and mux_out events when switching focus while hooking up more handlers. stop using CharDriverState->focus in monitor.c, track state using the mux events instead. This also removes the implicit assumtion that a muxed monitor allways has mux channel 0. Signed-off-by: Gerd Hoffmann --- monitor.c | 35 ++++++++++++++++++++++++----------- qemu-char.c | 4 ++++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index f5f4d0e..001d350 100644 --- a/monitor.c +++ b/monitor.c @@ -85,6 +85,8 @@ struct mon_fd_t { struct Monitor { CharDriverState *chr; + int mux_out; + int reset_seen; int flags; int suspend_cnt; uint8_t outbuf[1024]; @@ -129,7 +131,7 @@ static int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func, void monitor_flush(Monitor *mon) { - if (mon && mon->outbuf_index != 0 && mon->chr->focus == 0) { + if (mon && mon->outbuf_index != 0 && !mon->mux_out) { qemu_chr_write(mon->chr, mon->outbuf, mon->outbuf_index); mon->outbuf_index = 0; } @@ -3111,23 +3113,36 @@ static void monitor_event(void *opaque, int event) switch (event) { case CHR_EVENT_MUX_IN: - readline_restart(mon->rs); - monitor_resume(mon); - monitor_flush(mon); + mon->mux_out = 0; + if (mon->reset_seen) { + readline_restart(mon->rs); + monitor_resume(mon); + monitor_flush(mon); + } else { + mon->suspend_cnt = 0; + } break; case CHR_EVENT_MUX_OUT: - if (mon->suspend_cnt == 0) - monitor_printf(mon, "\n"); - monitor_flush(mon); - monitor_suspend(mon); + if (mon->reset_seen) { + if (mon->suspend_cnt == 0) { + monitor_printf(mon, "\n"); + } + monitor_flush(mon); + monitor_suspend(mon); + } else { + mon->suspend_cnt++; + } + mon->mux_out = 1; break; case CHR_EVENT_RESET: monitor_printf(mon, "QEMU %s monitor - type 'help' for more " "information\n", QEMU_VERSION); - if (mon->chr->focus == 0) + if (!mon->mux_out) { readline_show_prompt(mon->rs); + } + mon->reset_seen = 1; break; } } @@ -3155,8 +3170,6 @@ void monitor_init(CharDriverState *chr, int flags) mon->chr = chr; mon->flags = flags; - if (mon->chr->focus != 0) - mon->suspend_cnt = 1; /* mux'ed monitors start suspended */ if (flags & MONITOR_USE_READLINE) { mon->rs = readline_init(mon, monitor_find_completion); monitor_read_command(mon, 0); diff --git a/qemu-char.c b/qemu-char.c index ce2799e..4a5d03b 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -456,8 +456,12 @@ static void mux_chr_update_read_handler(CharDriverState *chr) qemu_chr_add_handlers(d->drv, mux_chr_can_read, mux_chr_read, mux_chr_event, chr); } + if (chr->focus != -1) { + mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_OUT); + } chr->focus = d->mux_cnt; d->mux_cnt++; + mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_IN); } static CharDriverState *qemu_chr_open_mux(CharDriverState *drv) -- 1.6.2.5