From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 18 May 2016 16:40:50 +0000 (-0400)
Subject: ui: spice: Exit if gl=on EGL init fails
X-Git-Tag: v2.6.1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5ba71b6b988a5935a5c244f3aecccebb12b81db;p=thirdparty%2Fqemu.git

ui: spice: Exit if gl=on EGL init fails

The user explicitly requested spice GL, so if we know it isn't
going to work we should exit

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: e3789e35b16f9e3cc6f2652f91c52d88ba6d6936.1463588606.git.crobinso@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit daafc661cc1a1de5a2e8ea0a7c0f396b827ebc3b)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 61db3c18b32..da0505434a0 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
 }