It's not that much complicated to type "-display sdl" or "-display curses",
so we should not clutter our main option name space with such simple
wrapper options and rather present the users with a concise interface
instead. Thus let's deprecate the "-sdl" and "-curses" wrapper options now.
Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
---
docs/system/deprecated.rst | 10 ++++++++++
softmmu/vl.c | 3 +++
2 files changed, 13 insertions(+)
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 89069856f1..52ce343963 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -148,6 +148,16 @@ Use ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
Use ``-display sdl,grab-mod=rctrl`` instead.
+``-sdl`` (since 6.1)
+''''''''''''''''''''
+
+Use ``-display sdl`` instead.
+
+``-curses`` (since 6.1)
+'''''''''''''''''''''''
+
+Use ``-display curses`` instead.
+
QEMU Machine Protocol (QMP) commands
------------------------------------
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 47cd47c840..e5ed90ce11 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2881,6 +2881,8 @@ void qemu_init(int argc, char **argv, char **envp)
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
@@ -3254,6 +3256,7 @@ void qemu_init(int argc, char **argv, char **envp)
"-display ...,window-close=off instead.");
break;
case QEMU_OPTION_sdl:
+ warn_report("-sdl is deprecated, use -display sdl instead.");
#ifdef CONFIG_SDL
dpy.type = DISPLAY_TYPE_SDL;
break;
--
2.27.0
