| Message ID | 1525446790-16139-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] qemu-options: Mark -virtioconsole as deprecated | expand |
On 04/05/2018 17:13, Thomas Huth wrote: > 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 <armbru@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > v2: > - Addressed Markus' review feedback from v1 > > qemu-doc.texi | 5 +++++ > qemu-options.hx | 5 +---- > vl.c | 2 ++ > 3 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/qemu-doc.texi b/qemu-doc.texi > index 0ed0f19..4add403 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 c611766..091ded6 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 806eec2..519e54f 100644 > --- a/vl.c > +++ b/vl.c > @@ -3598,6 +3598,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) { > Queued, thanks. Paolo
diff --git a/qemu-doc.texi b/qemu-doc.texi index 0ed0f19..4add403 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 c611766..091ded6 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 806eec2..519e54f 100644 --- a/vl.c +++ b/vl.c @@ -3598,6 +3598,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) {