[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/23] monitor: fix muxing
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 22/23] monitor: fix muxing |
Date: |
Mon, 7 Sep 2009 18:06:24 +0200 |
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 <address@hidden>
---
monitor.c | 33 ++++++++++++++++++++++-----------
qemu-char.c | 3 +++
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/monitor.c b/monitor.c
index f5f4d0e..edf48f3 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,34 @@ 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);
+ if (mon->reset_seen) {
+ readline_restart(mon->rs);
+ monitor_resume(mon);
+ monitor_flush(mon);
+ } else {
+ mon->suspend_cnt = 0;
+ }
+ mon->mux_out = 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 +3168,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 2e71038..daa8587 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -456,8 +456,11 @@ 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 (-1 != chr->focus)
+ 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
- [Qemu-devel] [PATCH 12/23] convert stdio chardev to QemuOpts., (continued)
- [Qemu-devel] [PATCH 12/23] convert stdio chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 10/23] convert unix+tcp chardevs to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 01/23] QemuOpts: split option parser into two functions., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 08/23] sockets: add inet_connect_opts, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 13/23] convert msmouse chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 09/23] sockets: add inet_listen_opts, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 15/23] convert windows console chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 21/23] qdev: add parser for chardev properties, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 17/23] convert vc chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 23/23] move mux focus field from CharDriverState to MuxDriver, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 22/23] monitor: fix muxing,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 20/23] Allow -serial chardev:<name>, Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 19/23] convert udp chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 18/23] convert mux chardev to QemuOpts., Gerd Hoffmann, 2009/09/07
- [Qemu-devel] [PATCH 16/23] convert tty + parport chardevs to QemuOpts., Gerd Hoffmann, 2009/09/07