From nobody Wed Oct 29 20:31:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=collabora.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525706365079226.09857064728135; Mon, 7 May 2018 08:19:25 -0700 (PDT) Received: from localhost ([::1]:46733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFhv0-00029U-Vf for importer@patchew.org; Mon, 07 May 2018 11:19:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFgPo-0004Mm-J0 for qemu-devel@nongnu.org; Mon, 07 May 2018 09:42:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFgPl-00006A-Gv for qemu-devel@nongnu.org; Mon, 07 May 2018 09:42:56 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35443) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fFgPl-00005z-9T for qemu-devel@nongnu.org; Mon, 07 May 2018 09:42:53 -0400 Received: by mail-wm0-x244.google.com with SMTP id o78-v6so15564184wmg.0 for ; Mon, 07 May 2018 06:42:52 -0700 (PDT) Received: from cizrna.lan ([109.72.12.56]) by smtp.gmail.com with ESMTPSA id d12-v6sm25184936wrg.2.2018.05.07.06.42.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 May 2018 06:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=GQJHkTnFFfX2zlgPj0qZci8bFK2CPnaQK5Kup5oUYTI=; b=J+F6xdl4lo4KWlnnVrc5FVdGrr5nkffmgOSvxdeDtO37P9QU4RtNceRhuU2DVX6i0g DwEkeeNj/pIs22CEmq4W2a+f/7sJAhd3WFARAfpu3t8OZb9f4W0EwZ6m+pS2LD0WPcSm bkgzIQdsvgoirYQIA5j0aQyqVi1b9GktZkN89AmMWKktv2R6nTSuC5mkUC3ERz5laRC0 heBVA/muvcj/+e3JQkGqG2Oz1ETqPNhb3vAnNGYmWz1pAL3nmHYL35sXqBXMYOXA+REJ lBrTCmuP6ojG+iYfwvnOGlzfYxDEXb5SU6GgMC3TlQr0J7D5nYai3ViRsv3+aABwn02p 51AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=GQJHkTnFFfX2zlgPj0qZci8bFK2CPnaQK5Kup5oUYTI=; b=KwxZ5ZYYza7qoWy3DUn8oGyk59C9GSx2zpUhHmWNFC+RiZB2uxa3T4WMrjSDqoBge/ UFK4qzx20N9ZmZdCn+P18p6k6m2cN9dcTAJFA4mDzpSUrc+kBYfxcAm//RwazagQpDJg NgUz2gla8bCzJpGEQg3+ivlQBkJFH+FI3NV/nvWAmsVFF9vzy0rRZvqQo9qfV+itLoSC ZkH04I/2oZzfLxEhJzN5JF+x+1+egaF0NrBhnWI+riy2FAkSTrb/pdq2xFgdqo7wf0ne aj/cyouFS8PUq0FTR0yW5/ViaQBSTvdvFjhjTdjIax4Ec/z0wzsAspFLfBCoMXPhzrP6 ZjUw== X-Gm-Message-State: ALKqPwesw65q0I3KhriRn6fCm7XnmkWcQGtovGDNhld8FqrM4bBjZ6jq WczGxQy4s+QO8Nd93IYRNQv/2TIZ X-Google-Smtp-Source: AB8JxZrWdXK88d01CJY3G19C2vUnHJWTbq8Zy1IK2bZkbiGjvNKx6pzhTXYCEMojM4UDSfG52kz6xA== X-Received: by 2002:a1c:d53:: with SMTP id 80-v6mr900307wmn.138.1525700571612; Mon, 07 May 2018 06:42:51 -0700 (PDT) From: Tomeu Vizoso To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 15:42:37 +0200 Message-Id: <20180507134237.14996-1-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 X-Mailman-Approved-At: Mon, 07 May 2018 11:18:03 -0400 Subject: [Qemu-devel] [PATCH] ui/gtk: Only try to initialize EGL/X11 if GtkGlArea failed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Tomeu Vizoso Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The commit referenced below changed the logic by causing the gtk-egl backend to be initialized regardless of whether GtkGlArea initialization succeeded. This causes eglInitialize to crash in Wayland systems without XWayland. This patch restores the previous logic. Fixes: 4c70280592f5 ("ui/gtk: use GtkGlArea on wayland only") Signed-off-by: Tomeu Vizoso --- ui/gtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/gtk.c b/ui/gtk.c index ef5bc42094a3..72e2e246244d 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2448,7 +2448,7 @@ static void early_gtk_display_init(DisplayOptions *op= ts) if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { gtk_use_gl_area =3D true; gtk_gl_area_init(); - } + } else #endif { gtk_egl_init(); --=20 2.17.0