diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-16 13:53:01 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-16 13:53:01 +0000 |
| commit | 83c496599cc04926ecbc3e47a37debaa3e38b686 (patch) | |
| tree | f9f4fa7e62b4d0fa2aa09ec7bef21660fe83bdf5 /qapi | |
| parent | 6ea4161e6451c8a99a3d8c197362e2113e7a5f6c (diff) | |
| parent | 144aaa990e0d54d08865c4d98ba2138a89689530 (diff) | |
| download | focaccia-qemu-83c496599cc04926ecbc3e47a37debaa3e38b686.tar.gz focaccia-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 'qapi')
| -rw-r--r-- | qapi/ui.json | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/qapi/ui.json b/qapi/ui.json index bf9e157d5a..e0000248d3 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1037,6 +1037,20 @@ 'data' : { '*grab-on-hover' : 'bool', '*zoom-to-fit' : 'bool' } } +## +# @DisplayEGLHeadless: +# +# EGL headless display options. +# +# @rendernode: Which DRM render node should be used. Default is the first +# available node on the host. +# +# Since: 3.1 +# +## +{ 'struct' : 'DisplayEGLHeadless', + 'data' : { '*rendernode' : 'str' } } + ## # @DisplayGLMode: # @@ -1086,4 +1100,5 @@ '*window-close' : 'bool', '*gl' : 'DisplayGLMode' }, 'discriminator' : 'type', - 'data' : { 'gtk' : 'DisplayGTK' } } + 'data' : { 'gtk' : 'DisplayGTK', + 'egl-headless' : 'DisplayEGLHeadless'} } |