|
 |
26ba25 |
From f44bd8a3bc71029a53cc06e848787cd867390b47 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
26ba25 |
Date: Wed, 13 Jun 2018 13:15:57 +0200
|
|
|
26ba25 |
Subject: [PATCH 063/268] qxl: fix local renderer crash
|
|
|
26ba25 |
MIME-Version: 1.0
|
|
|
26ba25 |
Content-Type: text/plain; charset=UTF-8
|
|
|
26ba25 |
Content-Transfer-Encoding: 8bit
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
26ba25 |
Message-id: <20180613131557.12255-2-kraxel@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 80662
|
|
|
26ba25 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/1] qxl: fix local renderer crash
|
|
|
26ba25 |
Bugzilla: 1567733
|
|
|
26ba25 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
Make sure we only ask the spice local renderer for display updates in
|
|
|
26ba25 |
case we have a valid primary surface. Without that spice is confused
|
|
|
26ba25 |
and throws errors in case a display update request (triggered by
|
|
|
26ba25 |
screendump for example) happens in parallel to a mode switch and hits
|
|
|
26ba25 |
the race window where the old primary surface is gone and the new isn't
|
|
|
26ba25 |
establisted yet.
|
|
|
26ba25 |
|
|
|
26ba25 |
Cc: qemu-stable@nongnu.org
|
|
|
26ba25 |
Fixes: https://bugzilla.redhat.com//show_bug.cgi?id=1567733
|
|
|
26ba25 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
26ba25 |
Message-id: 20180427115528.345-1-kraxel@redhat.com
|
|
|
26ba25 |
(cherry picked from commit 5bd5c27c7d284d01477c5cc022ce22438c46bf9f)
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
hw/display/qxl-render.c | 3 ++-
|
|
|
26ba25 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
|
|
|
26ba25 |
index e7ac4f8..c62b9a5 100644
|
|
|
26ba25 |
--- a/hw/display/qxl-render.c
|
|
|
26ba25 |
+++ b/hw/display/qxl-render.c
|
|
|
26ba25 |
@@ -169,7 +169,8 @@ void qxl_render_update(PCIQXLDevice *qxl)
|
|
|
26ba25 |
|
|
|
26ba25 |
qemu_mutex_lock(&qxl->ssd.lock);
|
|
|
26ba25 |
|
|
|
26ba25 |
- if (!runstate_is_running() || !qxl->guest_primary.commands) {
|
|
|
26ba25 |
+ if (!runstate_is_running() || !qxl->guest_primary.commands ||
|
|
|
26ba25 |
+ qxl->mode == QXL_MODE_UNDEFINED) {
|
|
|
26ba25 |
qxl_render_update_area_unlocked(qxl);
|
|
|
26ba25 |
qemu_mutex_unlock(&qxl->ssd.lock);
|
|
|
26ba25 |
return;
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|