diff mbox

monitor: Remove legacy "-mon default=on" parameter

Message ID 1513700253-10045-1-git-send-email-thuth@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Huth Dec. 19, 2017, 4:17 p.m. UTC
The "default" parameter of the "-mon" option is useless since
QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
should have been long enough to let people update their scripts,
so time to remove it now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 monitor.c     | 3 ---
 qemu-doc.texi | 9 ---------
 vl.c          | 4 ----
 3 files changed, 16 deletions(-)

Comments

Daniel P. Berrangé Dec. 19, 2017, 4:21 p.m. UTC | #1
On Tue, Dec 19, 2017 at 05:17:33PM +0100, Thomas Huth wrote:
> The "default" parameter of the "-mon" option is useless since
> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
> should have been long enough to let people update their scripts,
> so time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  monitor.c     | 3 ---
>  qemu-doc.texi | 9 ---------
>  vl.c          | 4 ----
>  3 files changed, 16 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index e36fb53..e53c6e1 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
>              .name = "chardev",
>              .type = QEMU_OPT_STRING,
>          },{
> -            .name = "default",  /* deprecated */
> -            .type = QEMU_OPT_BOOL,
> -        },{
>              .name = "pretty",
>              .type = QEMU_OPT_BOOL,
>          },
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index d9861b3..6913b32 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
>  The ``-no-kvm'' argument is now a synonym for setting
>  ``-machine accel=tcg''.
>  
> -@subsection -mon default=on (since 2.4.0)
> -
> -The ``default'' option to the ``-mon'' argument is
> -now ignored. When multiple monitors were enabled, it
> -indicated which monitor would receive log messages
> -from the various subsystems. This feature is no longer
> -required as messages are now only sent to the monitor
> -in response to explicitly monitor commands.
> -
>  @subsection -vnc tls (since 2.5.0)

It occurs to me that qemu.org only ever displays the very latest version
of the qemu-tech doc.

So if someone has deployed QEMU 2.11, and reads the doc online, once your
patches are commited, all the info about deprecated features that affect
their 2.11 version will have gone, despite 2.12 not yet existing. They'll
only find deprecation info in their locally installed doc. I think this
is pretty undesirable.

So rather than deleting entries from the deprecation appendix, should
we move them to a separate appendix, or "Formerly deprecated, now
deleted" features. Or just change the annotation

  (since 2.4.0)

to

  (deprecated since 2.4.0, deleted in 2.12.0)


same comment for all your patches deleting deprecated features.

Regards,
Daniel
Thomas Huth Dec. 19, 2017, 4:34 p.m. UTC | #2
On 19.12.2017 17:21, Daniel P. Berrange wrote:
> On Tue, Dec 19, 2017 at 05:17:33PM +0100, Thomas Huth wrote:
>> The "default" parameter of the "-mon" option is useless since
>> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
>> should have been long enough to let people update their scripts,
>> so time to remove it now.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  monitor.c     | 3 ---
>>  qemu-doc.texi | 9 ---------
>>  vl.c          | 4 ----
>>  3 files changed, 16 deletions(-)
>>
>> diff --git a/monitor.c b/monitor.c
>> index e36fb53..e53c6e1 100644
>> --- a/monitor.c
>> +++ b/monitor.c
>> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
>>              .name = "chardev",
>>              .type = QEMU_OPT_STRING,
>>          },{
>> -            .name = "default",  /* deprecated */
>> -            .type = QEMU_OPT_BOOL,
>> -        },{
>>              .name = "pretty",
>>              .type = QEMU_OPT_BOOL,
>>          },
>> diff --git a/qemu-doc.texi b/qemu-doc.texi
>> index d9861b3..6913b32 100644
>> --- a/qemu-doc.texi
>> +++ b/qemu-doc.texi
>> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
>>  The ``-no-kvm'' argument is now a synonym for setting
>>  ``-machine accel=tcg''.
>>  
>> -@subsection -mon default=on (since 2.4.0)
>> -
>> -The ``default'' option to the ``-mon'' argument is
>> -now ignored. When multiple monitors were enabled, it
>> -indicated which monitor would receive log messages
>> -from the various subsystems. This feature is no longer
>> -required as messages are now only sent to the monitor
>> -in response to explicitly monitor commands.
>> -
>>  @subsection -vnc tls (since 2.5.0)
> 
> It occurs to me that qemu.org only ever displays the very latest version
> of the qemu-tech doc.
> 
> So if someone has deployed QEMU 2.11, and reads the doc online, once your
> patches are commited, all the info about deprecated features that affect
> their 2.11 version will have gone, despite 2.12 not yet existing.

No, as far as I know, the online qemu-doc is only updated for release
candidates and releases, so the current information will stay there a
little bit longer.

> So rather than deleting entries from the deprecation appendix, should
> we move them to a separate appendix, or "Formerly deprecated, now
> deleted" features. Or just change the annotation
> 
>   (since 2.4.0)
> 
> to
> 
>   (deprecated since 2.4.0, deleted in 2.12.0)

Please, no. I really don't think that we should carry around the old
cruft forever, even if it's just in the deprecation chapter of the
qemu-doc. At one point in time, we should really just let it go. If
users still want to get information about this afterwards, they can use
Google to dig out older versions of the qemu-doc or the various
ChangeLog pages in our Wiki, where we describe the deprecation of
parameters, too.

 Thomas
Dr. David Alan Gilbert Dec. 19, 2017, 6:22 p.m. UTC | #3
* Thomas Huth (thuth@redhat.com) wrote:
> On 19.12.2017 17:21, Daniel P. Berrange wrote:
> > On Tue, Dec 19, 2017 at 05:17:33PM +0100, Thomas Huth wrote:
> >> The "default" parameter of the "-mon" option is useless since
> >> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
> >> should have been long enough to let people update their scripts,
> >> so time to remove it now.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>  monitor.c     | 3 ---
> >>  qemu-doc.texi | 9 ---------
> >>  vl.c          | 4 ----
> >>  3 files changed, 16 deletions(-)
> >>
> >> diff --git a/monitor.c b/monitor.c
> >> index e36fb53..e53c6e1 100644
> >> --- a/monitor.c
> >> +++ b/monitor.c
> >> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
> >>              .name = "chardev",
> >>              .type = QEMU_OPT_STRING,
> >>          },{
> >> -            .name = "default",  /* deprecated */
> >> -            .type = QEMU_OPT_BOOL,
> >> -        },{
> >>              .name = "pretty",
> >>              .type = QEMU_OPT_BOOL,
> >>          },
> >> diff --git a/qemu-doc.texi b/qemu-doc.texi
> >> index d9861b3..6913b32 100644
> >> --- a/qemu-doc.texi
> >> +++ b/qemu-doc.texi
> >> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
> >>  The ``-no-kvm'' argument is now a synonym for setting
> >>  ``-machine accel=tcg''.
> >>  
> >> -@subsection -mon default=on (since 2.4.0)
> >> -
> >> -The ``default'' option to the ``-mon'' argument is
> >> -now ignored. When multiple monitors were enabled, it
> >> -indicated which monitor would receive log messages
> >> -from the various subsystems. This feature is no longer
> >> -required as messages are now only sent to the monitor
> >> -in response to explicitly monitor commands.
> >> -
> >>  @subsection -vnc tls (since 2.5.0)
> > 
> > It occurs to me that qemu.org only ever displays the very latest version
> > of the qemu-tech doc.
> > 
> > So if someone has deployed QEMU 2.11, and reads the doc online, once your
> > patches are commited, all the info about deprecated features that affect
> > their 2.11 version will have gone, despite 2.12 not yet existing.
> 
> No, as far as I know, the online qemu-doc is only updated for release
> candidates and releases, so the current information will stay there a
> little bit longer.
> 
> > So rather than deleting entries from the deprecation appendix, should
> > we move them to a separate appendix, or "Formerly deprecated, now
> > deleted" features. Or just change the annotation
> > 
> >   (since 2.4.0)
> > 
> > to
> > 
> >   (deprecated since 2.4.0, deleted in 2.12.0)
> 
> Please, no. I really don't think that we should carry around the old
> cruft forever, even if it's just in the deprecation chapter of the
> qemu-doc. At one point in time, we should really just let it go. If
> users still want to get information about this afterwards, they can use
> Google to dig out older versions of the qemu-doc or the various
> ChangeLog pages in our Wiki, where we describe the deprecation of
> parameters, too.

I agree this is a job for a separate page; either the ChangeLog or
a separate 'defunct' wikipage.

Dave

>  Thomas
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Stefan Weil Dec. 19, 2017, 9:05 p.m. UTC | #4
Am 19.12.2017 um 17:34 schrieb Thomas Huth:
> No, as far as I know, the online qemu-doc is only updated for release
> candidates and releases, so the current information will stay there a
> little bit longer.

It's normally updated when I create new QEMU installers for Windows.
I can update it when needed, and it is also possible to provide
additional qemu-doc for releases (https://qemu.weilnetz.de/doc/).

Regards,
Stefan
Thomas Huth Jan. 22, 2018, 7:30 a.m. UTC | #5
On 19.12.2017 17:17, Thomas Huth wrote:
> The "default" parameter of the "-mon" option is useless since
> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
> should have been long enough to let people update their scripts,
> so time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  monitor.c     | 3 ---
>  qemu-doc.texi | 9 ---------
>  vl.c          | 4 ----
>  3 files changed, 16 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index e36fb53..e53c6e1 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
>              .name = "chardev",
>              .type = QEMU_OPT_STRING,
>          },{
> -            .name = "default",  /* deprecated */
> -            .type = QEMU_OPT_BOOL,
> -        },{
>              .name = "pretty",
>              .type = QEMU_OPT_BOOL,
>          },
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index d9861b3..6913b32 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
>  The ``-no-kvm'' argument is now a synonym for setting
>  ``-machine accel=tcg''.
>  
> -@subsection -mon default=on (since 2.4.0)
> -
> -The ``default'' option to the ``-mon'' argument is
> -now ignored. When multiple monitors were enabled, it
> -indicated which monitor would receive log messages
> -from the various subsystems. This feature is no longer
> -required as messages are now only sent to the monitor
> -in response to explicitly monitor commands.
> -
>  @subsection -vnc tls (since 2.5.0)
>  
>  The ``-vnc tls'' argument is now a synonym for setting
> diff --git a/vl.c b/vl.c
> index 2644400..4e7a7e4 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2438,10 +2438,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
>      if (qemu_opt_get_bool(opts, "pretty", 0))
>          flags |= MONITOR_USE_PRETTY;
>  
> -    if (qemu_opt_get_bool(opts, "default", 0)) {
> -        error_report("option 'default' does nothing and is deprecated");
> -    }
> -
>      chardev = qemu_opt_get(opts, "chardev");
>      chr = qemu_chr_find(chardev);
>      if (chr == NULL) {
> 

Ping?

 Thomas
Dr. David Alan Gilbert Jan. 22, 2018, 7:35 p.m. UTC | #6
* Thomas Huth (thuth@redhat.com) wrote:
> The "default" parameter of the "-mon" option is useless since
> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
> should have been long enough to let people update their scripts,
> so time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Seems reasonable.


Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  monitor.c     | 3 ---
>  qemu-doc.texi | 9 ---------
>  vl.c          | 4 ----
>  3 files changed, 16 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index e36fb53..e53c6e1 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
>              .name = "chardev",
>              .type = QEMU_OPT_STRING,
>          },{
> -            .name = "default",  /* deprecated */
> -            .type = QEMU_OPT_BOOL,
> -        },{
>              .name = "pretty",
>              .type = QEMU_OPT_BOOL,
>          },
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index d9861b3..6913b32 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
>  The ``-no-kvm'' argument is now a synonym for setting
>  ``-machine accel=tcg''.
>  
> -@subsection -mon default=on (since 2.4.0)
> -
> -The ``default'' option to the ``-mon'' argument is
> -now ignored. When multiple monitors were enabled, it
> -indicated which monitor would receive log messages
> -from the various subsystems. This feature is no longer
> -required as messages are now only sent to the monitor
> -in response to explicitly monitor commands.
> -
>  @subsection -vnc tls (since 2.5.0)
>  
>  The ``-vnc tls'' argument is now a synonym for setting
> diff --git a/vl.c b/vl.c
> index 2644400..4e7a7e4 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2438,10 +2438,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
>      if (qemu_opt_get_bool(opts, "pretty", 0))
>          flags |= MONITOR_USE_PRETTY;
>  
> -    if (qemu_opt_get_bool(opts, "default", 0)) {
> -        error_report("option 'default' does nothing and is deprecated");
> -    }
> -
>      chardev = qemu_opt_get(opts, "chardev");
>      chr = qemu_chr_find(chardev);
>      if (chr == NULL) {
> -- 
> 1.8.3.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Paolo Bonzini Jan. 26, 2018, 9:37 a.m. UTC | #7
On 22/01/2018 20:35, Dr. David Alan Gilbert wrote:
> * Thomas Huth (thuth@redhat.com) wrote:
>> The "default" parameter of the "-mon" option is useless since
>> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
>> should have been long enough to let people update their scripts,
>> so time to remove it now.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> 
> Seems reasonable.
> 
> 
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Are you also queuing it yourself?

Thanks,

Paolo

>> ---
>>  monitor.c     | 3 ---
>>  qemu-doc.texi | 9 ---------
>>  vl.c          | 4 ----
>>  3 files changed, 16 deletions(-)
>>
>> diff --git a/monitor.c b/monitor.c
>> index e36fb53..e53c6e1 100644
>> --- a/monitor.c
>> +++ b/monitor.c
>> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
>>              .name = "chardev",
>>              .type = QEMU_OPT_STRING,
>>          },{
>> -            .name = "default",  /* deprecated */
>> -            .type = QEMU_OPT_BOOL,
>> -        },{
>>              .name = "pretty",
>>              .type = QEMU_OPT_BOOL,
>>          },
>> diff --git a/qemu-doc.texi b/qemu-doc.texi
>> index d9861b3..6913b32 100644
>> --- a/qemu-doc.texi
>> +++ b/qemu-doc.texi
>> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
>>  The ``-no-kvm'' argument is now a synonym for setting
>>  ``-machine accel=tcg''.
>>  
>> -@subsection -mon default=on (since 2.4.0)
>> -
>> -The ``default'' option to the ``-mon'' argument is
>> -now ignored. When multiple monitors were enabled, it
>> -indicated which monitor would receive log messages
>> -from the various subsystems. This feature is no longer
>> -required as messages are now only sent to the monitor
>> -in response to explicitly monitor commands.
>> -
>>  @subsection -vnc tls (since 2.5.0)
>>  
>>  The ``-vnc tls'' argument is now a synonym for setting
>> diff --git a/vl.c b/vl.c
>> index 2644400..4e7a7e4 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -2438,10 +2438,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
>>      if (qemu_opt_get_bool(opts, "pretty", 0))
>>          flags |= MONITOR_USE_PRETTY;
>>  
>> -    if (qemu_opt_get_bool(opts, "default", 0)) {
>> -        error_report("option 'default' does nothing and is deprecated");
>> -    }
>> -
>>      chardev = qemu_opt_get(opts, "chardev");
>>      chr = qemu_chr_find(chardev);
>>      if (chr == NULL) {
>> -- 
>> 1.8.3.1
>>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>
Dr. David Alan Gilbert Jan. 26, 2018, 8 p.m. UTC | #8
* Paolo Bonzini (pbonzini@redhat.com) wrote:
> On 22/01/2018 20:35, Dr. David Alan Gilbert wrote:
> > * Thomas Huth (thuth@redhat.com) wrote:
> >> The "default" parameter of the "-mon" option is useless since
> >> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
> >> should have been long enough to let people update their scripts,
> >> so time to remove it now.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > 
> > Seems reasonable.
> > 
> > 
> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> 
> Are you also queuing it yourself?

Yes I will do; I was just watching out for another HMP patch or two
so it doesn't feel lonely.

Dave

> Thanks,
> 
> Paolo
> 
> >> ---
> >>  monitor.c     | 3 ---
> >>  qemu-doc.texi | 9 ---------
> >>  vl.c          | 4 ----
> >>  3 files changed, 16 deletions(-)
> >>
> >> diff --git a/monitor.c b/monitor.c
> >> index e36fb53..e53c6e1 100644
> >> --- a/monitor.c
> >> +++ b/monitor.c
> >> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
> >>              .name = "chardev",
> >>              .type = QEMU_OPT_STRING,
> >>          },{
> >> -            .name = "default",  /* deprecated */
> >> -            .type = QEMU_OPT_BOOL,
> >> -        },{
> >>              .name = "pretty",
> >>              .type = QEMU_OPT_BOOL,
> >>          },
> >> diff --git a/qemu-doc.texi b/qemu-doc.texi
> >> index d9861b3..6913b32 100644
> >> --- a/qemu-doc.texi
> >> +++ b/qemu-doc.texi
> >> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
> >>  The ``-no-kvm'' argument is now a synonym for setting
> >>  ``-machine accel=tcg''.
> >>  
> >> -@subsection -mon default=on (since 2.4.0)
> >> -
> >> -The ``default'' option to the ``-mon'' argument is
> >> -now ignored. When multiple monitors were enabled, it
> >> -indicated which monitor would receive log messages
> >> -from the various subsystems. This feature is no longer
> >> -required as messages are now only sent to the monitor
> >> -in response to explicitly monitor commands.
> >> -
> >>  @subsection -vnc tls (since 2.5.0)
> >>  
> >>  The ``-vnc tls'' argument is now a synonym for setting
> >> diff --git a/vl.c b/vl.c
> >> index 2644400..4e7a7e4 100644
> >> --- a/vl.c
> >> +++ b/vl.c
> >> @@ -2438,10 +2438,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
> >>      if (qemu_opt_get_bool(opts, "pretty", 0))
> >>          flags |= MONITOR_USE_PRETTY;
> >>  
> >> -    if (qemu_opt_get_bool(opts, "default", 0)) {
> >> -        error_report("option 'default' does nothing and is deprecated");
> >> -    }
> >> -
> >>      chardev = qemu_opt_get(opts, "chardev");
> >>      chr = qemu_chr_find(chardev);
> >>      if (chr == NULL) {
> >> -- 
> >> 1.8.3.1
> >>
> > --
> > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> > 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Dr. David Alan Gilbert Feb. 16, 2018, 4:18 p.m. UTC | #9
* Thomas Huth (thuth@redhat.com) wrote:
> The "default" parameter of the "-mon" option is useless since
> QEMU v2.4.0, and marked as deprecated since QEMU v2.8.0. That
> should have been long enough to let people update their scripts,
> so time to remove it now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued for HMP (at last...)

Dave

> ---
>  monitor.c     | 3 ---
>  qemu-doc.texi | 9 ---------
>  vl.c          | 4 ----
>  3 files changed, 16 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index e36fb53..e53c6e1 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4141,9 +4141,6 @@ QemuOptsList qemu_mon_opts = {
>              .name = "chardev",
>              .type = QEMU_OPT_STRING,
>          },{
> -            .name = "default",  /* deprecated */
> -            .type = QEMU_OPT_BOOL,
> -        },{
>              .name = "pretty",
>              .type = QEMU_OPT_BOOL,
>          },
> diff --git a/qemu-doc.texi b/qemu-doc.texi
> index d9861b3..6913b32 100644
> --- a/qemu-doc.texi
> +++ b/qemu-doc.texi
> @@ -2401,15 +2401,6 @@ setting ``-machine kernel_irqchip=off''.
>  The ``-no-kvm'' argument is now a synonym for setting
>  ``-machine accel=tcg''.
>  
> -@subsection -mon default=on (since 2.4.0)
> -
> -The ``default'' option to the ``-mon'' argument is
> -now ignored. When multiple monitors were enabled, it
> -indicated which monitor would receive log messages
> -from the various subsystems. This feature is no longer
> -required as messages are now only sent to the monitor
> -in response to explicitly monitor commands.
> -
>  @subsection -vnc tls (since 2.5.0)
>  
>  The ``-vnc tls'' argument is now a synonym for setting
> diff --git a/vl.c b/vl.c
> index 2644400..4e7a7e4 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2438,10 +2438,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
>      if (qemu_opt_get_bool(opts, "pretty", 0))
>          flags |= MONITOR_USE_PRETTY;
>  
> -    if (qemu_opt_get_bool(opts, "default", 0)) {
> -        error_report("option 'default' does nothing and is deprecated");
> -    }
> -
>      chardev = qemu_opt_get(opts, "chardev");
>      chr = qemu_chr_find(chardev);
>      if (chr == NULL) {
> -- 
> 1.8.3.1
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff mbox

Patch

diff --git a/monitor.c b/monitor.c
index e36fb53..e53c6e1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4141,9 +4141,6 @@  QemuOptsList qemu_mon_opts = {
             .name = "chardev",
             .type = QEMU_OPT_STRING,
         },{
-            .name = "default",  /* deprecated */
-            .type = QEMU_OPT_BOOL,
-        },{
             .name = "pretty",
             .type = QEMU_OPT_BOOL,
         },
diff --git a/qemu-doc.texi b/qemu-doc.texi
index d9861b3..6913b32 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2401,15 +2401,6 @@  setting ``-machine kernel_irqchip=off''.
 The ``-no-kvm'' argument is now a synonym for setting
 ``-machine accel=tcg''.
 
-@subsection -mon default=on (since 2.4.0)
-
-The ``default'' option to the ``-mon'' argument is
-now ignored. When multiple monitors were enabled, it
-indicated which monitor would receive log messages
-from the various subsystems. This feature is no longer
-required as messages are now only sent to the monitor
-in response to explicitly monitor commands.
-
 @subsection -vnc tls (since 2.5.0)
 
 The ``-vnc tls'' argument is now a synonym for setting
diff --git a/vl.c b/vl.c
index 2644400..4e7a7e4 100644
--- a/vl.c
+++ b/vl.c
@@ -2438,10 +2438,6 @@  static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
     if (qemu_opt_get_bool(opts, "pretty", 0))
         flags |= MONITOR_USE_PRETTY;
 
-    if (qemu_opt_get_bool(opts, "default", 0)) {
-        error_report("option 'default' does nothing and is deprecated");
-    }
-
     chardev = qemu_opt_get(opts, "chardev");
     chr = qemu_chr_find(chardev);
     if (chr == NULL) {