diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-06 22:05:53 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-06 22:05:53 +0000 |
| commit | 395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1 (patch) | |
| tree | 412907c02d2f579aa3331120b82cb85344e199a4 | |
| parent | 374b63590ec7ddfe5b3130ede79d14ca09b76d67 (diff) | |
| parent | 88b40c683fda6fa00639de01d4274e94bd4f1cdd (diff) | |
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>
| -rw-r--r-- | qemu-options.hx | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 1fc2470e2f..637597d0d9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -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" +#endif +#if defined(CONFIG_GTK) "-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" - "-display egl-headless[,rendernode=<file>]" - " select display type\n" - "The default display is equivalent to\n" + " select display backend type\n" + " The default display is equivalent to\n " #if defined(CONFIG_GTK) - "\t\"-display gtk\"\n" + "\"-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 |