diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-14 13:44:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-14 13:44:17 +0100 |
| commit | 0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7 (patch) | |
| tree | a78392b7d1b0433162c0d0aff74db6f39613a4df /ui/console.c | |
| parent | bcf9e2c0a5f8de395842e034ca15be13d1fc5f90 (diff) | |
| parent | 7c336f9fe53b1a500f21241841c7bf4267c7ee14 (diff) | |
| download | focaccia-qemu-0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7.tar.gz focaccia-qemu-0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170913-pull-request' into staging
ui: console fixes drop pixman submodule # gpg: Signature made Wed 13 Sep 2017 09:40:34 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20170913-pull-request: console: add question-mark escape operator console: fix dpy_gfx_replace_surface assert pixman: drop configure switches pixman: drop submodule Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/console.c')
| -rw-r--r-- | ui/console.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/console.c b/ui/console.c index d2d3534c49..b82c27960a 100644 --- a/ui/console.c +++ b/ui/console.c @@ -880,8 +880,9 @@ static void console_putchar(QemuConsole *s, int ch) } else { if (s->nb_esc_params < MAX_ESC_PARAMS) s->nb_esc_params++; - if (ch == ';') + if (ch == ';' || ch == '?') { break; + } trace_console_putchar_csi(s->esc_params[0], s->esc_params[1], ch, s->nb_esc_params); s->state = TTY_STATE_NORM; @@ -1540,7 +1541,7 @@ void dpy_gfx_replace_surface(QemuConsole *con, DisplaySurface *old_surface = con->surface; DisplayChangeListener *dcl; - assert(old_surface != surface); + assert(old_surface != surface || surface == NULL); con->surface = surface; QLIST_FOREACH(dcl, &s->listeners, next) { |