aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2016-03-14 12:41:12 +0100
committerGerd Hoffmann <kraxel@redhat.com>2016-03-24 08:04:01 +0100
commit569a93cbbe428bb5c583ae4bf31447eb3acc30fe (patch)
tree51483df76da3c5dcd5b6b67bda8e6338c5835193
parent81b00c968a86250684b49d528a7841c4abe0b1c9 (diff)
downloadqemu-569a93cbbe428bb5c583ae4bf31447eb3acc30fe.zip
qemu-569a93cbbe428bb5c583ae4bf31447eb3acc30fe.tar.gz
qemu-569a93cbbe428bb5c583ae4bf31447eb3acc30fe.tar.bz2
spice: Disallow use of gl + TCP port
Currently, virgl support has to go through a local unix socket, trying to connect to a VM using -spice gl through spice://localhost:5900 will only result in a black screen. This commit errors out when the user tries to start a VM with both GL support and a port/tls-port set. This would fit better in spice-server, but currently QEMU does not call into spice-server when parsing 'gl' on its command line, so we have to do this check in QEMU instead. Signed-off-by: Christophe Fergeau <cfergeau@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 1457955672-28758-1-git-send-email-cfergeau@redhat.com [ applied codestyle fix: break long line ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/spice-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c
index e117925..61db3c1 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -828,6 +828,11 @@ void qemu_spice_init(void)
#ifdef HAVE_SPICE_GL
if (qemu_opt_get_bool(opts, "gl", 0)) {
+ if ((port != 0) || (tls_port != 0)) {
+ error_report("SPICE GL support is local-only for now and "
+ "incompatible with -spice port/tls-port");
+ exit(1);
+ }
if (egl_rendernode_init() == 0) {
display_opengl = 1;
}