diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-10-22 12:53:01 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 15:46:10 +0200 |
| commit | a4afa548fc6dd9842ed86639b4d37d4d1c4ad480 (patch) | |
| tree | 94f8e8304a29960fa03001cd3d57b75c600becd8 /ui/console.c | |
| parent | ea3af47d75335d9247dfa33554ddd935957f77cd (diff) | |
| download | focaccia-qemu-a4afa548fc6dd9842ed86639b4d37d4d1c4ad480.tar.gz focaccia-qemu-a4afa548fc6dd9842ed86639b4d37d4d1c4ad480.zip | |
char: move front end handlers in CharBackend
Since the hanlders are associated with a CharBackend, rather than the CharDriverState, it is more appropriate to store in CharBackend. This avoids the handler copy dance in qemu_chr_fe_set_handlers() then mux_chr_update_read_handler(), by storing the CharBackend pointer directly. Also a mux CharDriver should go through mux->backends[focused], since chr->be will stay NULL. Before that, it was possible to call chr->handler by mistake with surprising results, for ex through qemu_chr_be_can_write(), which would result in calling the last set handler front end, not the one with focus. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20161022095318.17775-22-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'ui/console.c')
| -rw-r--r-- | ui/console.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/console.c b/ui/console.c index 19adac75e5..f490346780 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1083,6 +1083,7 @@ static void kbd_send_chars(void *opaque) void kbd_put_keysym_console(QemuConsole *s, int keysym) { uint8_t buf[16], *q; + CharBackend *be; int c; if (!s || (s->console_type == GRAPHIC_CONSOLE)) @@ -1125,7 +1126,8 @@ void kbd_put_keysym_console(QemuConsole *s, int keysym) if (s->echo) { console_puts(s->chr, buf, q - buf); } - if (s->chr->chr_read) { + be = s->chr->be; + if (be && be->chr_read) { qemu_fifo_write(&s->out_fifo, buf, q - buf); kbd_send_chars(s); } |