[Qemu-devel] [PULL 0/1] Vga 20180507 patches

[Qemu-devel] [PULL 0/1] Vga 20180507 patches

[Gerd Hoffmann]

The following changes since commit c8b7e627b4269a3bc3ae41d9f420547a47e6d9b9:

  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-05-04' into staging (2018-05-04 14:42:46 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/vga-20180507-pull-request

for you to fetch changes up to 5bd5c27c7d284d01477c5cc022ce22438c46bf9f:

  qxl: fix local renderer crash (2018-05-07 11:47:57 +0200)

----------------------------------------------------------------
qxl: fix local renderer crash

----------------------------------------------------------------

Gerd Hoffmann (1):
  qxl: fix local renderer crash

 hw/display/qxl-render.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/1] qxl: fix local renderer crash

[Gerd Hoffmann]

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
---
 hw/display/qxl-render.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/1] Vga 20180507 patches

[Peter Maydell]

On 7 May 2018 at 10:52, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit c8b7e627b4269a3bc3ae41d9f420547a47e6d9b9:
>
>   Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-05-04' into staging (2018-05-04 14:42:46 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/vga-20180507-pull-request
>
> for you to fetch changes up to 5bd5c27c7d284d01477c5cc022ce22438c46bf9f:
>
>   qxl: fix local renderer crash (2018-05-07 11:47:57 +0200)
>
> ----------------------------------------------------------------
> qxl: fix local renderer crash
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   qxl: fix local renderer crash
>
>  hw/display/qxl-render.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks.

-- PMM