From patchwork Fri Jun 3 07:04:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 69226 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp123172qgf; Fri, 3 Jun 2016 00:16:28 -0700 (PDT) X-Received: by 10.200.47.212 with SMTP id m20mr1835400qta.53.1464938188459; Fri, 03 Jun 2016 00:16:28 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y9si1584014qkg.176.2016.06.03.00.16.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 03 Jun 2016 00:16:28 -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 Received: from localhost ([::1]:52479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jLI-0005Ky-1C for patch@linaro.org; Fri, 03 Jun 2016 03:16:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8j9w-0003q0-KQ for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8j9o-0006NY-5T for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:04:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8j9n-0006K6-Vg for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:04:36 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06392C05B1EC for ; Fri, 3 Jun 2016 07:04:34 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5374Wq9013518; Fri, 3 Jun 2016 03:04:33 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 3CC9480C57; Fri, 3 Jun 2016 09:04:30 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 3 Jun 2016 09:04:23 +0200 Message-Id: <1464937468-14816-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1464937468-14816-1-git-send-email-kraxel@redhat.com> References: <1464937468-14816-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 03 Jun 2016 07:04:34 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/7] ui: spice: Exit if gl=on EGL init fails 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 , Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson The user explicitly requested spice GL, so if we know it isn't going to work we should exit Signed-off-by: Cole Robinson Reviewed-by: Marc-André Lureau Message-id: e3789e35b16f9e3cc6f2652f91c52d88ba6d6936.1463588606.git.crobinso@redhat.com Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 1.8.3.1 diff --git a/ui/spice-core.c b/ui/spice-core.c index 61db3c1..da05054 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -833,9 +833,11 @@ void qemu_spice_init(void) "incompatible with -spice port/tls-port"); exit(1); } - if (egl_rendernode_init() == 0) { - display_opengl = 1; + if (egl_rendernode_init() != 0) { + error_report("Failed to initialize EGL render node for SPICE GL"); + exit(1); } + display_opengl = 1; } #endif }