mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20191106-pull-request' into staging

Browse Source 
ui: rework -display help text

# gpg: Signature made Wed 06 Nov 2019 07:06:52 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20191106-pull-request:
  qemu-options: Rework the help text of the '-display' option

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2019-11-06 22:05:53 +00:00
parent 374b63590e 88b40c683f
commit 395e4ed1a3
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
qemu-options.hx
View File

@ -1546,26 +1546,38 @@ STEXI
ETEXI
DEF("display", HAS_ARG, QEMU_OPTION_display,
#if defined(CONFIG_SPICE)
"-display spice-app[,gl=on|off]\n"
"-display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off]\n"
#endif
#if defined(CONFIG_SDL)
"-display sdl[,alt_grab=on|off][,ctrl_grab=on|off]\n"
" [,window_close=on|off][,gl=on|core|es|off]\n"
"-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"
"-display vnc=<display>[,<optargs>]\n"
"-display curses[,charset=<encoding>]\n"
"-display none\n"
"-display egl-headless[,rendernode=<file>]"
" select display type\n"
"The default display is equivalent to\n"
#endif
#if defined(CONFIG_GTK)
"\t\"-display gtk\"\n"
"-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"
#endif
#if defined(CONFIG_VNC)
"-display vnc=<display>[,<optargs>]\n"
#endif
#if defined(CONFIG_CURSES)
"-display curses[,charset=<encoding>]\n"
#endif
#if defined(CONFIG_OPENGL)
"-display egl-headless[,rendernode=<file>]\n"
#endif
"-display none\n"
" select display backend type\n"
" The default display is equivalent to\n "
#if defined(CONFIG_GTK)
"\"-display gtk\"\n"
#elif defined(CONFIG_SDL)
"\t\"-display sdl\"\n"
"\"-display sdl\"\n"
#elif defined(CONFIG_COCOA)
"\t\"-display cocoa\"\n"
"\"-display cocoa\"\n"
#elif defined(CONFIG_VNC)
"\t\"-vnc localhost:0,to=99,id=default\"\n"
"\"-vnc localhost:0,to=99,id=default\"\n"
#else
"\t\"-display none\"\n"
"\"-display none\"\n"
#endif
, QEMU_ARCH_ALL)
STEXI