[Qemu-commits] [qemu/qemu] 88b40c: qemu-options: Rework the help text of the '-displa...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 88b40c683fda6fa00639de01d4274e94bd4f1cdd
      
https://github.com/qemu/qemu/commit/88b40c683fda6fa00639de01d4274e94bd4f1cdd
  Author: Thomas Huth <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Rework the help text of the '-display' option

Improve the help text of the "-display" option:

- Only print the options that we have enabled in the binary
  (similar to what we do for other options like -netdev already)

- The "frame=on|off" from "-display sdl" has been removed in commit
  09bd7ba9f5f7 ("Remove deprecated -no-frame option"), so we should
  not show this in the help text anymore

- The "-display egl-headless" line was missing a "\n" at the end

- Indent the default display text in a nicer way

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1
      
https://github.com/qemu/qemu/commit/395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-06 (Wed, 06 Nov 2019)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  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) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/374b63590ec7...395e4ed1a366