From: Thomas Huth Date: Fri, 4 May 2018 15:13:10 +0000 (+0200) Subject: qemu-options: Mark -virtioconsole as deprecated X-Git-Tag: v3.0.0-rc0~163^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=454012997e0818e371750893c87c28c155ef14e3;p=thirdparty%2Fqemu.git qemu-options: Mark -virtioconsole as deprecated 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. Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth Message-Id: <1525446790-16139-1-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/qemu-doc.texi b/qemu-doc.texi index 0ed0f19e6ba..4add403bf19 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) + +Option @option{-virtioconsole} has been replaced by +@option{-device virtconsole}. + @section qemu-img command line arguments @subsection convert -s (since 2.0.0) diff --git a/qemu-options.hx b/qemu-options.hx index c6117663907..091ded6e0c3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3675,10 +3675,7 @@ STEXI @item -virtioconsole @var{c} @findex -virtioconsole Set virtio console. - -This option is maintained for backward compatibility. - -Please use @code{-device virtconsole} for the new way of invocation. +This option is deprecated, please use @option{-device virtconsole} instead. ETEXI DEF("show-cursor", 0, QEMU_OPTION_show_cursor, \ diff --git a/vl.c b/vl.c index 12e31d1aa99..b928e3e439e 100644 --- a/vl.c +++ b/vl.c @@ -3587,6 +3587,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) {