diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 16:31:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 16:31:38 +0000 |
| commit | c8f21dbfc3dea943ca5edac2f00058477ecb5b6b (patch) | |
| tree | bc1e072313852a03d487a20da639a93ba354211d /ui/spice-core.c | |
| parent | 6753e4ed150ca1f94651aad06c031680a0be6cac (diff) | |
| parent | 0ea1523fb6703aa0dcd65e66b59e96fec028e60a (diff) | |
| download | focaccia-qemu-c8f21dbfc3dea943ca5edac2f00058477ecb5b6b.tar.gz focaccia-qemu-c8f21dbfc3dea943ca5edac2f00058477ecb5b6b.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170220-1' into staging
ui: opengl fixes, for spice and egl-helpers. # gpg: Signature made Mon 20 Feb 2017 13:12:46 GMT # gpg: using RSA key 0x4CB6D8EED3E87138 # 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>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/pull-ui-20170220-1: egl-helpers: Support newer MESA versions spice: allow to specify drm rendernode 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, 4 insertions, 1 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 1452e77fd1..39ccab7561 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -501,6 +501,9 @@ static QemuOptsList qemu_spice_opts = { },{ .name = "gl", .type = QEMU_OPT_BOOL, + },{ + .name = "rendernode", + .type = QEMU_OPT_STRING, #endif }, { /* end of list */ } @@ -833,7 +836,7 @@ void qemu_spice_init(void) "incompatible with -spice port/tls-port"); exit(1); } - if (egl_rendernode_init() != 0) { + if (egl_rendernode_init(qemu_opt_get(opts, "rendernode")) != 0) { error_report("Failed to initialize EGL render node for SPICE GL"); exit(1); } |