mirror of https://github.com/proxmox/mirror_qemu
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
master
parent
cd958edb1f
commit
f607867cef
|
@ -387,6 +387,7 @@ QemuConsole *qemu_console_lookup_by_device_name(const char *device_id,
|
||||||
bool qemu_console_is_visible(QemuConsole *con);
|
bool qemu_console_is_visible(QemuConsole *con);
|
||||||
bool qemu_console_is_graphic(QemuConsole *con);
|
bool qemu_console_is_graphic(QemuConsole *con);
|
||||||
bool qemu_console_is_fixedsize(QemuConsole *con);
|
bool qemu_console_is_fixedsize(QemuConsole *con);
|
||||||
|
bool qemu_console_is_gl_blocked(QemuConsole *con);
|
||||||
char *qemu_console_get_label(QemuConsole *con);
|
char *qemu_console_get_label(QemuConsole *con);
|
||||||
int qemu_console_get_index(QemuConsole *con);
|
int qemu_console_get_index(QemuConsole *con);
|
||||||
uint32_t qemu_console_get_head(QemuConsole *con);
|
uint32_t qemu_console_get_head(QemuConsole *con);
|
||||||
|
|
15
ui/console.c
15
ui/console.c
|
@ -123,6 +123,7 @@ struct QemuConsole {
|
||||||
DisplaySurface *surface;
|
DisplaySurface *surface;
|
||||||
int dcls;
|
int dcls;
|
||||||
DisplayChangeListener *gl;
|
DisplayChangeListener *gl;
|
||||||
|
bool gl_block;
|
||||||
|
|
||||||
/* Graphic console state. */
|
/* Graphic console state. */
|
||||||
Object *device;
|
Object *device;
|
||||||
|
@ -264,10 +265,10 @@ void graphic_hw_update(QemuConsole *con)
|
||||||
|
|
||||||
void graphic_hw_gl_block(QemuConsole *con, bool block)
|
void graphic_hw_gl_block(QemuConsole *con, bool block)
|
||||||
{
|
{
|
||||||
if (!con) {
|
assert(con != NULL);
|
||||||
con = active_console;
|
|
||||||
}
|
con->gl_block = block;
|
||||||
if (con && con->hw_ops->gl_block) {
|
if (con->hw_ops->gl_block) {
|
||||||
con->hw_ops->gl_block(con->hw, 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);
|
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)
|
char *qemu_console_get_label(QemuConsole *con)
|
||||||
{
|
{
|
||||||
if (con->console_type == GRAPHIC_CONSOLE) {
|
if (con->console_type == GRAPHIC_CONSOLE) {
|
||||||
|
|
Loading…
Reference in New Issue