diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-09-23 09:50:27 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-09-28 12:49:35 +0200 |
| commit | f607867cefdbf1bcb2bd4449ba96cae4994f6224 (patch) | |
| tree | b3b66e6bc9fd9aef002fde5f7cdc47cd266ab47c /ui/console.c | |
| parent | cd958edb1fae85d0c7d1e1acbff82d22724e8d64 (diff) | |
| download | focaccia-qemu-f607867cefdbf1bcb2bd4449ba96cae4994f6224.tar.gz focaccia-qemu-f607867cefdbf1bcb2bd4449ba96cae4994f6224.zip | |
console: track gl_block state in QemuConsole
Keep track of gl_block state (added in bba19b8 console: block rendering until client is done) in QemuConsole and allow to query it. This way we can avoid state inconsistencies in case different code paths make use of this. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 1474617028-3979-2-git-send-email-kraxel@redhat.com
Diffstat (limited to 'ui/console.c')
| -rw-r--r-- | ui/console.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ui/console.c b/ui/console.c index 394786b3c7..fa3e658edd 100644 --- a/ui/console.c +++ b/ui/console.c @@ -123,6 +123,7 @@ struct QemuConsole { DisplaySurface *surface; int dcls; DisplayChangeListener *gl; + bool gl_block; /* Graphic console state. */ Object *device; @@ -264,10 +265,10 @@ void graphic_hw_update(QemuConsole *con) void graphic_hw_gl_block(QemuConsole *con, bool block) { - if (!con) { - con = active_console; - } - if (con && con->hw_ops->gl_block) { + assert(con != NULL); + + con->gl_block = block; + if (con->hw_ops->gl_block) { con->hw_ops->gl_block(con->hw, block); } } @@ -1879,6 +1880,12 @@ bool qemu_console_is_fixedsize(QemuConsole *con) return con && (con->console_type != TEXT_CONSOLE); } +bool qemu_console_is_gl_blocked(QemuConsole *con) +{ + assert(con != NULL); + return con->gl_block; +} + char *qemu_console_get_label(QemuConsole *con) { if (con->console_type == GRAPHIC_CONSOLE) { |