openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: rework -display help text 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJdwnEMAAoJEEy22O7T6HE4Cv8QANJ4WiptcsaX9QqVLh6imOsy
 +LxO9t5ehamRLUiI8QNA2yCe4bZoJEQNf0oi6qiA8MX40/SKX3RBlF+0iBP3OsQf
 xmARWQ1bi1/1We30TxtiAiyMvSb0aIfkBDN4rWeNLf5VBtj9pGv3lkj5dko8dlyL
 n7OKat2VZhsUX/xwTcnl1qJMPMEF3bWQ9keitIf9koqb93mGv9rD0/tC2oTNWeFr
 rd321otshvNSla9QsWm/R38c3GIgUQnRnA2CjgXzoaxwVmsL1Ol1bhZPBKEd4ZqW
 G5OQM7C2jMEd0ppyN350aqEDlEzMk8F9WP7gRJRVeJ+8MIZiUe4m8cFaZsWg4nTf
 N+Ai6HclRK9g6JJ++BPwe0mAwl1cLC1e+4UAIiB5k6KeqLX1W7RfJ0ZI7ZYIMchX
 C51uLhQrOywxNpoIvQs8dicym6Vfg8uJuksI0J0lOweGBq04WCQ4abF/5rIr+Yga
 QHo+jtQRDwssrs0FMkTG1O0Mqy6AVQjMvR/VBlvwrThasKrE99jbNFSW4MrSr/mS
 Hazfb8hH6HX2Ix7yKtnrlSQIE/D4L/1ZLnXSQjYv3b9Fy1KJfhfAF8ttmogbvCrT
 IUqEH/+0YjSDpAJU5/luVPzDi0nW9ecEcjg+93VFfv/SQobODVYCvY2k47xbHmmy
 nk3t46pB1hbesqVVuuau
 =p6tp
 -----END PGP SIGNATURE-----

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qemu-options.hx
View File

@ -1546,26 +1546,38 @@ STEXI
ETEXI ETEXI
DEF("display", HAS_ARG, QEMU_OPTION_display, DEF("display", HAS_ARG, QEMU_OPTION_display,
#if defined(CONFIG_SPICE)
"-display spice-app[,gl=on|off]\n" "-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" " [,window_close=on|off][,gl=on|core|es|off]\n"
"-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n" #endif
"-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"
#if defined(CONFIG_GTK) #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) #elif defined(CONFIG_SDL)
"\t\"-display sdl\"\n" "\"-display sdl\"\n"
#elif defined(CONFIG_COCOA) #elif defined(CONFIG_COCOA)
"\t\"-display cocoa\"\n" "\"-display cocoa\"\n"
#elif defined(CONFIG_VNC) #elif defined(CONFIG_VNC)
"\t\"-vnc localhost:0,to=99,id=default\"\n" "\"-vnc localhost:0,to=99,id=default\"\n"
#else #else
"\t\"-display none\"\n" "\"-display none\"\n"
#endif #endif
, QEMU_ARCH_ALL) , QEMU_ARCH_ALL)
STEXI STEXI