|
 |
9bac43 |
From d8e09c7193591639d22c197bf265080cb22c2404 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
Date: Fri, 12 Jan 2018 11:30:11 +0100
|
|
|
9bac43 |
Subject: [PATCH 01/20] console: fix dpy_gfx_replace_surface assert
|
|
|
9bac43 |
MIME-Version: 1.0
|
|
|
9bac43 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9bac43 |
Content-Transfer-Encoding: 8bit
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
Message-id: <20180112113011.21952-2-kraxel@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 78565
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 1/1] console: fix dpy_gfx_replace_surface assert
|
|
|
9bac43 |
Bugzilla: 1505696
|
|
|
9bac43 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
virtio-gpu can trigger the assert added by commit "6905b93447 console:
|
|
|
9bac43 |
add same surface replace pre-condition" in multihead setups (where
|
|
|
9bac43 |
surface can be NULL for secondary displays). Allow surface being NULL.
|
|
|
9bac43 |
|
|
|
9bac43 |
Fixes: 6905b93447a42e606dfd126b90f75f4cd3c6fe94
|
|
|
9bac43 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9bac43 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
9bac43 |
Message-id: 20170906142109.2685-1-kraxel@redhat.com
|
|
|
9bac43 |
(cherry picked from commit 1540008629bbb6a9c0826582d94ecf7a559f784c)
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
ui/console.c | 2 +-
|
|
|
9bac43 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/ui/console.c b/ui/console.c
|
|
|
9bac43 |
index 6967fd4..e92e9e0 100644
|
|
|
9bac43 |
--- a/ui/console.c
|
|
|
9bac43 |
+++ b/ui/console.c
|
|
|
9bac43 |
@@ -1565,7 +1565,7 @@ void dpy_gfx_replace_surface(QemuConsole *con,
|
|
|
9bac43 |
DisplaySurface *old_surface = con->surface;
|
|
|
9bac43 |
DisplayChangeListener *dcl;
|
|
|
9bac43 |
|
|
|
9bac43 |
- assert(old_surface != surface);
|
|
|
9bac43 |
+ assert(old_surface != surface || surface == NULL);
|
|
|
9bac43 |
|
|
|
9bac43 |
con->surface = surface;
|
|
|
9bac43 |
QLIST_FOREACH(dcl, &s->listeners, next) {
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|