Commit 395e4ed1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 374b6359 88b40c68

qemu-options.hx

+21 −9
Original line number Original line Diff line number Diff line
@@ -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"

#endif

#if defined(CONFIG_GTK)

    "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"

    "-display gtk[,grab_on_hover=on|off][,gl=on|off]|\n"

#endif

#if defined(CONFIG_VNC)

    "-display vnc=<display>[,<optargs>]\n"

    "-display vnc=<display>[,<optargs>]\n"

#endif

#if defined(CONFIG_CURSES)

    "-display curses[,charset=<encoding>]\n"

    "-display curses[,charset=<encoding>]\n"

#endif

#if defined(CONFIG_OPENGL)

    "-display egl-headless[,rendernode=<file>]\n"

#endif

    "-display none\n"

    "-display none\n"

    "-display egl-headless[,rendernode=<file>]"

    "                select display backend type\n"

    "                select display type\n"

    "                The default display is equivalent to\n                "

    "                The default display is equivalent to\n                "

#if defined(CONFIG_GTK)

#if defined(CONFIG_GTK)

            "\t\"-display gtk\"\n"

            "\"-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