aboutsummaryrefslogtreecommitdiff
path: root/softmmu/vl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-05-15 11:18:13 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-05-15 11:18:13 +0100
commit2478b8ecd45f81a21b9aa319ce7147a790a2144f (patch)
treeeab6d7b2335e61e28855bf408740fa3aaaa73862 /softmmu/vl.c
parent0db949f1810f4d497762d57d8db6f219c0607529 (diff)
parent32ec9839d89d2b814ada20b041b25feae23596bc (diff)
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200515-pull-request' into staging
ui: sdl bugfix, -show-cursor deprecation message # gpg: Signature made Fri 15 May 2020 09:21:29 BST # 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-20200515-pull-request: ui/sdl2: fix segment fault caused by null pointer dereference ui: improve -show-cursor deprecation message Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu/vl.c')
-rw-r--r--softmmu/vl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index f84151acd3..ae5451bc23 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3531,8 +3531,10 @@ void qemu_init(int argc, char **argv, char **envp)
no_shutdown = 1;
break;
case QEMU_OPTION_show_cursor:
- warn_report("The -show-cursor option is deprecated, "
- "use -display {sdl,gtk},show-cursor=on instead");
+ warn_report("The -show-cursor option is deprecated. Please "
+ "add show-cursor=on to your -display options.");
+ warn_report("When using the default display you can use "
+ "-display default,show-cursor=on");
dpy.has_show_cursor = true;
dpy.show_cursor = true;
break;