* Thomas Huth (th...@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 <th...@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 / dgilb...@redhat.com / Manchester, UK