[Qemu-devel] [PATCH] qemu-options: Mark -virtioconsole as deprecated

[Thomas Huth <thuth@redhat.com>]

The qemu-doc already states that this option is only maintained for
backward compatibility and "-device virtconsole" should be used
instead. So let's take the next step and mark this option officially
as deprecated.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 qemu-doc.texi   | 5 +++++
 qemu-options.hx | 2 +-
 vl.c            | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index 5813d27..e48ed05 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2931,6 +2931,11 @@ The @code{-localtime} option has been replaced by @code{-rtc base=localtime}.
 
 The @code{-startdate} option has been replaced by @code{-rtc base=@var{date}}.
 
+@subsection -virtioconsole (since 2.13.0)
+
+You can use @code{-device virtconsole} instead of @code{-virtioconsole}
+to configure a virtio-console.
+
 @section qemu-img command line arguments
 
 @subsection convert -s (since 2.0.0)
diff --git a/qemu-options.hx b/qemu-options.hx
index c611766..7693d2c 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3676,7 +3676,7 @@ STEXI
 @findex -virtioconsole
 Set virtio console.
 
-This option is maintained for backward compatibility.
+This option is deprecated and only maintained for backward compatibility.
 
 Please use @code{-device virtconsole} for the new way of invocation.
 ETEXI
diff --git a/vl.c b/vl.c
index 7487535..c409ff3 100644
--- a/vl.c
+++ b/vl.c
@@ -3634,6 +3634,8 @@ int main(int argc, char **argv, char **envp)
                 }
                 break;
             case QEMU_OPTION_virtiocon:
+                warn_report("This option is deprecated, "
+                            "use '-device virtconsole' instead.");
                 add_device_config(DEV_VIRTCON, optarg);
                 default_virtcon = 0;
                 if (strncmp(optarg, "mon:", 4) == 0) {
-- 
1.8.3.1