diff options
| author | Gerd Hoffmann | 2018-04-27 13:55:28 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2018-05-07 11:47:57 +0200 |
| commit | 5bd5c27c7d284d01477c5cc022ce22438c46bf9f (patch) | |
| tree | c472f85639623adb17f39105a75c41b343ce5306 /hw/display | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-05-04' into st... (diff) | |
| download | qemu-5bd5c27c7d284d01477c5cc022ce22438c46bf9f.tar.gz qemu-5bd5c27c7d284d01477c5cc022ce22438c46bf9f.tar.xz qemu-5bd5c27c7d284d01477c5cc022ce22438c46bf9f.zip | |
qxl: fix local renderer crash
Make sure we only ask the spice local renderer for display updates in
case we have a valid primary surface. Without that spice is confused
and throws errors in case a display update request (triggered by
screendump for example) happens in parallel to a mode switch and hits
the race window where the old primary surface is gone and the new isn't
establisted yet.
Cc: qemu-stable@nongnu.org
Fixes: https://bugzilla.redhat.com//show_bug.cgi?id=1567733
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180427115528.345-1-kraxel@redhat.com
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl-render.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index e7ac4f8789..c62b9a5e75 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -169,7 +169,8 @@ void qxl_render_update(PCIQXLDevice *qxl) qemu_mutex_lock(&qxl->ssd.lock); - if (!runstate_is_running() || !qxl->guest_primary.commands) { + if (!runstate_is_running() || !qxl->guest_primary.commands || + qxl->mode == QXL_MODE_UNDEFINED) { qxl_render_update_area_unlocked(qxl); qemu_mutex_unlock(&qxl->ssd.lock); return; |