aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-12-10 16:58:08 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2020-12-15 12:52:03 -0500
commit90d6a086bb220bcd8b2ba3c881ac53862caa4987 (patch)
treeaa9af40fe9863b9ad3c2c84fade7af39a0e7b955
parentc8c9dc42b7ca84b6892b51e3daeb693a9efec7a4 (diff)
Remove the deprecated -show-cursor option
It has been marked as deprecated since QEMU v5.0, replaced by the corresponding parameter of the -display option. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20201210155808.233895-5-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--docs/system/deprecated.rst6
-rw-r--r--docs/system/removed-features.rst6
-rw-r--r--qemu-options.hx7
-rw-r--r--softmmu/vl.c8
4 files changed, 6 insertions, 21 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 16810d1b85..bacd76d7a5 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -94,12 +94,6 @@ QEMU 5.1 has three options:
to the user to load all the images they need.
3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae.
-``-show-cursor`` option (since 5.0)
-'''''''''''''''''''''''''''''''''''
-
-Use ``-display sdl,show-cursor=on`` or
- ``-display gtk,show-cursor=on`` instead.
-
``Configuring floppies with ``-global``
'''''''''''''''''''''''''''''''''''''''
diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
index 58d4e3874c..8b20d78a4d 100644
--- a/docs/system/removed-features.rst
+++ b/docs/system/removed-features.rst
@@ -26,6 +26,12 @@ The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``.
The ``-realtime mlock=on|off`` argument has been replaced by the
``-overcommit mem-lock=on|off`` argument.
+``-show-cursor`` option (since 5.0)
+'''''''''''''''''''''''''''''''''''
+
+Use ``-display sdl,show-cursor=on``, ``-display gtk,show-cursor=on``
+or ``-display default,show-cursor=on`` instead.
+
``-tb-size`` option (removed in 6.0)
''''''''''''''''''''''''''''''''''''
diff --git a/qemu-options.hx b/qemu-options.hx
index c85f73e300..459c916d3d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4092,13 +4092,6 @@ SRST
ERST
-DEF("show-cursor", 0, QEMU_OPTION_show_cursor, \
- "-show-cursor show cursor\n", QEMU_ARCH_ALL)
-SRST
-``-show-cursor``
- Show cursor.
-ERST
-
DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
"-incoming tcp:[host]:port[,to=maxport][,ipv4][,ipv6]\n" \
"-incoming rdma:host:port[,ipv4][,ipv6]\n" \
diff --git a/softmmu/vl.c b/softmmu/vl.c
index b3918d6a68..c56e6dc0b3 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3204,14 +3204,6 @@ void qemu_init(int argc, char **argv, char **envp)
olist = qemu_find_opts("action");
qemu_opts_parse_noisily(olist, "panic=pause,shutdown=pause", false);
break;
- case QEMU_OPTION_show_cursor:
- 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;
case QEMU_OPTION_uuid:
if (qemu_uuid_parse(optarg, &qemu_uuid) < 0) {
error_report("failed to parse UUID string: wrong format");