From 1540008629bbb6a9c0826582d94ecf7a559f784c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 6 Sep 2017 16:21:09 +0200 Subject: console: fix dpy_gfx_replace_surface assert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ui/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c index d2d3534c49..f0292d7820 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1540,7 +1540,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) { -- cgit v1.2.3