diff options
author | Peter Maydell | 2018-11-16 14:53:01 +0100 |
---|---|---|
committer | Peter Maydell | 2018-11-16 14:53:01 +0100 |
commit | 83c496599cc04926ecbc3e47a37debaa3e38b686 (patch) | |
tree | f9f4fa7e62b4d0fa2aa09ec7bef21660fe83bdf5 /ui/egl-headless.c | |
parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
parent | help: Provide help for egl-headless (diff) | |
download | qemu-83c496599cc04926ecbc3e47a37debaa3e38b686.tar.gz qemu-83c496599cc04926ecbc3e47a37debaa3e38b686.tar.xz qemu-83c496599cc04926ecbc3e47a37debaa3e38b686.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181116-pull-request' into staging
ui: add rendernode arg for egl-headless (fixes permission issues with libvirt)
# gpg: Signature made Fri 16 Nov 2018 13:29:15 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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/fixes-31-20181116-pull-request:
help: Provide help for egl-headless
ui: Allow specifying 'rendernode' display option for egl-headless
qapi: Add "rendernode" display option for egl-headless
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/egl-headless.c')
-rw-r--r-- | ui/egl-headless.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/egl-headless.c b/ui/egl-headless.c index 42a41310b0..4cf3bbc0e4 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -176,7 +176,7 @@ static void egl_headless_init(DisplayState *ds, DisplayOptions *opts) egl_dpy *edpy; int idx; - if (egl_rendernode_init(NULL, mode) < 0) { + if (egl_rendernode_init(opts->u.egl_headless.rendernode, mode) < 0) { error_report("egl: render node init failed"); exit(1); } |