diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-24 16:00:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-24 16:00:14 +0000 |
| commit | f18f2e7cfcdc31d7f82af15947aae60c4b16e131 (patch) | |
| tree | da9999caa961abf68c83a264cae13f71cee6fa2a /ui/spice-core.c | |
| parent | 490dda053e3324c97b28439813fab4c2f362183e (diff) | |
| parent | 569a93cbbe428bb5c583ae4bf31447eb3acc30fe (diff) | |
| download | focaccia-qemu-f18f2e7cfcdc31d7f82af15947aae60c4b16e131.tar.gz focaccia-qemu-f18f2e7cfcdc31d7f82af15947aae60c4b16e131.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160324-1' into staging
input-linux + spice fixes # gpg: Signature made Thu 24 Mar 2016 07:54:45 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-ui-20160324-1: spice: Disallow use of gl + TCP port input-linux: fix Coverity warning input-linux: switch over to -object Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index e1179258d0..61db3c18b3 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; } |