mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: add rendernode arg for egl-headless (fixes permission issues with libvirt)

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJb7sYrAAoJEEy22O7T6HE4BooP+QE7Y+2aiCuFMN86D5AbHrDj
 WgDhh82L/RY75KhASH10fTI6+R5hXM6gqxXQTK6Jo4mdytvzubp6vcb6XfZ+IVw1
 X9/naOA67IpqOeeb0WTScbK106K+t7bYZjdv8qwEWmgPHqbW31C2MaFa//19BCP+
 xVShANXl+i1LCyp4TbJQR99fr2HQxHG5n0d/8FUvTH/iofqf75jCZzXw6PdkLN0J
 kajvO+MpQQi2W4xAHt8+SrVI3KFK9YvIxWFDbuN4Okhh426UDQYKmFUrXWYisnB6
 eE9ljEI3+KrNsoPtV1jThHXSYvDN6/yrdAvootxt8/N4rVET2bMcL/9TKKtWO6YN
 NRrPANf8Rw/GRVoD2LyM8KneTT1Oc1ub5u7RUJLxFlkD0fDyIqOS74hBCKvdpVj8
 T4llZiwISpuG75krztV7r1/EpCk2nhBrigYnnYwlBaFhTEg2xITsSxATcxtBVKpu
 fzenzGMwrSJdhh1D1A5eAd3DK6VZpljtwkCmN6Gem0L8WRKStpNlcxay0q9aFwYD
 E8YFRCBRJo/p93SAT3IX2CnsfRraUrCLJHOoBEyZ0W1J2xmM0nVg/Lj0XSxpCpL5
 u2W1yBghjE+s2rtRMklzcir+le4cH7Jm08vUwhGoEtlynLHSmHh7vDr46xnglGTE
 mdAZRRCxLWsqNdWeUpSc
 =v9N4
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-11-16 13:53:01 +00:00
commit 83c496599c
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qapi/ui.json
View File

@ -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'} }

6
qemu-options.hx
View File

@ -1216,7 +1216,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
"-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"
"-display vnc=<display>[,<optargs>]\n"
"-display curses\n"
"-display none"
"-display none\n"
"-display egl-headless[,rendernode=<file>]"
" select display type\n"
"The default display is equivalent to\n"
#if defined(CONFIG_GTK)
@ -1258,6 +1259,9 @@ menus and other UI elements to configure and control the VM during
runtime.
@item vnc
Start a VNC server on display <arg>
@item egl-headless
Offload all OpenGL operations to a local DRI device. For any graphical display,
this display needs to be paired with either VNC or SPICE displays.
@end table
ETEXI

2
ui/egl-headless.c
View File

@ -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);
}