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