From patchwork Tue May 15 09:18:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 135858 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp750363lji; Tue, 15 May 2018 02:25:02 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrN9kTAzNBltI1xCPxD0wT+W1DM11mo0pdDQTTeOwTy021L1zrCJY2qZoNtQiLhpp5Dm/EL X-Received: by 2002:a0c:b4a2:: with SMTP id c34-v6mr12475636qve.70.1526376302348; Tue, 15 May 2018 02:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526376302; cv=none; d=google.com; s=arc-20160816; b=1IeaqQIiOy3u4ndySoBeLmKbLX0osi/pqM6TSy/e4aAKdkyRypRtsdbdTEcQyMheCZ XX5zDPlcWcATrbPvd0UL1cOolP2Jx4877VwvvyvQ9HSRmwdNtDJNqnnqXlJa1XX9K2do lrKRlimOm7ur9LsjG52Bw4SOUnTrSGAJzhIv3xd9vX9ZyDR1VyRYtSwptWn5GT7Ocb6i etgCx5YO3Uud+sX+bN67hh6B9ABenYu1b13QuKKqDsdVVLSURDED7esz82Ok2abLRgTX ahTvBAAWSqzTmIa2OQ8lumPemjb5SO6t2IQJAeFQyFhtWbUxqsxSj0Djbi6sPURT6ys2 HU/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=L///Ll0jJj8+yXsh7EYg3hipN8cYQVGM83NAl3XckpY=; b=K2+KpsP8xpx8DfuuwH/IdteIV2RBBOVtkPY3T1kdsnrGjfOur/ucBgKDKQEU7bhiTj ENFjhsYMorH+YXGXA4mliggjyVIV6JZhHp52fArNs4kc7tgqe4lXCasyS+o4UQWV6gBJ uzAQrqhD7IXLqKyMAvu7Vfll5mTvIA+drgjmZDG4mUyiFXdpnqv8RBVEEjZAUu1BXe22 gc64G+eQdu0vDtj+Wej2cGL0r2tk8xfNMpaEEStKPUf0U71pDnCHqSXbsgLWpmkFCQ77 +LLZO5VcD4/7XQct9RSIsLHMZo6xAnqsKIiFSAjHO0Awbmp6uuo/fa30CgUMNw4898Kk ZAww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e10-v6si5782144qvm.131.2018.05.15.02.25.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 15 May 2018 02:25:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:53892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIWCb-0007zn-MF for patch@linaro.org; Tue, 15 May 2018 05:25:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIW6u-0004Dw-8y for qemu-devel@nongnu.org; Tue, 15 May 2018 05:19:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIW6q-0001Tm-6J for qemu-devel@nongnu.org; Tue, 15 May 2018 05:19:08 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34836 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fIW6q-0001TF-1c; Tue, 15 May 2018 05:19:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8356141AE7C6; Tue, 15 May 2018 09:19:03 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6335D215CDA7; Tue, 15 May 2018 09:19:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BA43D3EC01; Tue, 15 May 2018 11:19:01 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 15 May 2018 11:18:54 +0200 Message-Id: <20180515091901.27774-4-kraxel@redhat.com> In-Reply-To: <20180515091901.27774-1-kraxel@redhat.com> References: <20180515091901.27774-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 15 May 2018 09:19:03 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 15 May 2018 09:19:03 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 03/10] 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: Tomeu Vizoso , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Tomeu Vizoso 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 Message-id: 20180507134237.14996-1-tomeu.vizoso@collabora.com Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.3 diff --git a/ui/gtk.c b/ui/gtk.c index 9e5390f2c2..568c9563ce 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2484,7 +2484,7 @@ static void early_gtk_display_init(DisplayOptions *opts) if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { gtk_use_gl_area = true; gtk_gl_area_init(); - } + } else #endif { gtk_egl_init();