8:44 a.m.
We have "-sdl" and "-curses", but no "-gtk" and no
"-cocoa" ...
these old-style options are rather confusing than helpful nowadays.
Now that the deprecation period is over, let's remove them, so we
get a cleaner interface (where "-display" is the only way to select
the user interface).
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
Signed-off-by: Thomas Huth <thuth(a)redhat.com>
---
docs/about/deprecated.rst | 10 ----------
docs/about/removed-features.rst | 10 ++++++++++
softmmu/vl.c | 19 -------------------
qemu-options.hx | 24 ++----------------------
4 files changed, 12 insertions(+), 51 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 562a133f18..e19bcba242 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -81,16 +81,6 @@ the process listing. This is replaced by the new ``password-secret``
option which lets the password be securely provided on the command
line using a ``secret`` object instance.
-``-sdl`` (since 6.2)
-''''''''''''''''''''
-
-Use ``-display sdl`` instead.
-
-``-curses`` (since 6.2)
-'''''''''''''''''''''''
-
-Use ``-display curses`` instead.
-
``-watchdog`` (since 6.2)
'''''''''''''''''''''''''
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index 4c9e001c35..c7b9dadd5d 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -386,6 +386,16 @@ Use ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
Use ``-display sdl,grab-mod=rctrl`` instead.
+``-sdl`` (removed in 7.1)
+'''''''''''''''''''''''''
+
+Use ``-display sdl`` instead.
+
+``-curses`` (removed in 7.1)
+''''''''''''''''''''''''''''
+
+Use ``-display curses`` instead.
+
QEMU Machine Protocol (QMP) commands
------------------------------------
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 484e9d9921..4c1e94b00e 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2800,16 +2800,6 @@ void qemu_init(int argc, char **argv, char **envp)
nographic = true;
dpy.type = DISPLAY_TYPE_NONE;
break;
- case QEMU_OPTION_curses:
- warn_report("-curses is deprecated, "
- "use -display curses instead.");
-#ifdef CONFIG_CURSES
- dpy.type = DISPLAY_TYPE_CURSES;
-#else
- error_report("curses or iconv support is disabled");
- exit(1);
-#endif
- break;
case QEMU_OPTION_portrait:
graphic_rotate = 90;
break;
@@ -3176,15 +3166,6 @@ void qemu_init(int argc, char **argv, char **envp)
dpy.has_full_screen = true;
dpy.full_screen = true;
break;
- case QEMU_OPTION_sdl:
- warn_report("-sdl is deprecated, use -display sdl instead.");
-#ifdef CONFIG_SDL
- dpy.type = DISPLAY_TYPE_SDL;
- break;
-#else
- error_report("SDL support is disabled");
- exit(1);
-#endif
case QEMU_OPTION_pidfile:
pid_file = optarg;
break;
diff --git a/qemu-options.hx b/qemu-options.hx
index 011caad530..3efca0e7f9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1981,9 +1981,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
, QEMU_ARCH_ALL)
SRST
``-display type``
- Select type of display to use. This option is a replacement for the
- old style -sdl/-curses/... options. Use ``-display help`` to list
- the available display types. Valid values for type are
+ Select type of display to use. Use ``-display help`` to list the available
+ display types. Valid values for type are
``spice-app[,gl=on|off]``
Start QEMU as a Spice server and launch the default Spice client
@@ -2085,25 +2084,6 @@ SRST
Use C-a h for help on switching between the console and monitor.
ERST
-DEF("curses", 0, QEMU_OPTION_curses,
- "-curses shorthand for -display curses\n",
- QEMU_ARCH_ALL)
-SRST
-``-curses``
- Normally, if QEMU is compiled with graphical window support, it
- displays output such as guest graphics, guest console, and the QEMU
- monitor in a window. With this option, QEMU can display the VGA
- output when in text mode using a curses/ncurses interface. Nothing
- is displayed in graphical mode.
-ERST
-
-DEF("sdl", 0, QEMU_OPTION_sdl,
- "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL)
-SRST
-``-sdl``
- Enable SDL.
-ERST
-
#ifdef CONFIG_SPICE
DEF("spice", HAS_ARG, QEMU_OPTION_spice,
"-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n"
--
2.27.0