summary refs log tree commit diff stats
path: root/vl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-01-14 16:00:31 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-01-14 16:00:31 +0000
commit3a63b24a1bbf166e6f455fe43a6bbd8dea413d92 (patch)
treef6def5fbe955648e9d632a2a266fc80c02b12893 /vl.c
parentfee0ec1fd11a6fb960517e18201ed8a686a0d7e8 (diff)
parentc4c00922cc948bb5e879bfae60764eba1f8745f3 (diff)
downloadfocaccia-qemu-3a63b24a1bbf166e6f455fe43a6bbd8dea413d92.tar.gz
focaccia-qemu-3a63b24a1bbf166e6f455fe43a6bbd8dea413d92.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200114-pull-request' into staging
ui: add "-display help", gtk refresh rate.

# gpg: Signature made Tue 14 Jan 2020 10:01:14 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-20200114-pull-request:
  display/gtk: get proper refreshrate
  ui: Print available display backends with '-display help'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index 158a05ed32..751401214c 100644
--- a/vl.c
+++ b/vl.c
@@ -1869,6 +1869,11 @@ static void parse_display(const char *p)
 {
     const char *opts;
 
+    if (is_help_option(p)) {
+        qemu_display_help();
+        exit(0);
+    }
+
     if (strstart(p, "sdl", &opts)) {
         /*
          * sdl DisplayType needs hand-crafted parser instead of