softmmu/vl: Deprecate the -sdl and -curses option

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.

Message-Id: <20210825092023[email protected]>
Reviewed-by: Gerd Hoffmann <[email protected]>
Acked-by: Peter Krempa <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index e7f8d6f49a98859fb7c930e12aaa37e7913dd117..9ee355ec0ba2925bcccc67dabf623c505cc57231 100644 (file)
--- a/docs/about/deprecated.rst
+++ b/docs/about/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.2)
+''''''''''''''''''''
+
+Use ``-display sdl`` instead.
+
+``-curses`` (since 6.2)
+'''''''''''''''''''''''
+
+Use ``-display curses`` instead.
+
 
 Plugin argument passing through ``arg=<string>`` (since 6.1)
 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

diff --git a/softmmu/vl.c b/softmmu/vl.c
index e9346b49d2402c5de438d555725a295b53c2f8aa..55ab70eb97fe0a17a441fec3a668ac06a5de290b 100644 (file)
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2889,6 +2889,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
@@ -3262,6 +3264,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;