From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds3EG-0006Cl-A5 for qemu-devel@nongnu.org; Wed, 13 Sep 2017 04:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds3E6-0000tL-Rs for qemu-devel@nongnu.org; Wed, 13 Sep 2017 04:41:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ds3E6-0000sV-MS for qemu-devel@nongnu.org; Wed, 13 Sep 2017 04:40:54 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B013C0587F2 for ; Wed, 13 Sep 2017 08:40:53 +0000 (UTC) From: Gerd Hoffmann Date: Wed, 13 Sep 2017 10:40:50 +0200 Message-Id: <20170913084051.21378-4-kraxel@redhat.com> In-Reply-To: <20170913084051.21378-1-kraxel@redhat.com> References: <20170913084051.21378-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/4] console: fix dpy_gfx_replace_surface assert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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=C3=A9 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 =3D con->surface; DisplayChangeListener *dcl; =20 - assert(old_surface !=3D surface); + assert(old_surface !=3D surface || surface =3D=3D NULL); =20 con->surface =3D surface; QLIST_FOREACH(dcl, &s->listeners, next) { --=20 2.9.3