aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2021-03-11 11:56:58 +0400
committerMarc-André Lureau <marcandre.lureau@redhat.com>2021-12-21 10:50:21 +0400
commita9b1e471e1783a1d7ae9215f9b8adc7cdb053367 (patch)
tree0a258aa27ef99532ba0f0478ab25e2e6935ba628
parenta4ddc31417199eab96211b254097a0a0869d5bea (diff)
ui: add a gl-unblock warning timer
Similar to the one that exists for Spice, so we can investigate if something is locked. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/console.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/ui/console.c b/ui/console.c
index 39f7b66baf..fcc4fe6a0a 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -80,6 +80,7 @@ struct QemuConsole {
int dcls;
DisplayChangeListener *gl;
int gl_block;
+ QEMUTimer *gl_unblock_timer;
int window_id;
/* Graphic console state. */
@@ -233,8 +234,14 @@ void graphic_hw_update(QemuConsole *con)
}
}
+static void graphic_hw_gl_unblock_timer(void *opaque)
+{
+ warn_report("console: no gl-unblock within one second");
+}
+
void graphic_hw_gl_block(QemuConsole *con, bool block)
{
+ uint64_t timeout;
assert(con != NULL);
if (block) {
@@ -250,6 +257,14 @@ void graphic_hw_gl_block(QemuConsole *con, bool block)
return;
}
con->hw_ops->gl_block(con->hw, block);
+
+ if (block) {
+ timeout = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
+ timeout += 1000; /* one sec */
+ timer_mod(con->gl_unblock_timer, timeout);
+ } else {
+ timer_del(con->gl_unblock_timer);
+ }
}
void graphic_hw_gl_flushed(QemuConsole *con)
@@ -1966,6 +1981,8 @@ QemuConsole *graphic_console_init(DeviceState *dev, uint32_t head,
surface = qemu_create_placeholder_surface(width, height, noinit);
dpy_gfx_replace_surface(s, surface);
+ s->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
+ graphic_hw_gl_unblock_timer, s);
return s;
}