Commit bdbcb547 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Tokarev
Browse files

monitor: deprecate 'default' option 



This option does nothing since commit 06ac27f6.  Deprecate it.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent e7709b49

include/monitor/monitor.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
extern Monitor *cur_mon;



/* flags for monitor_init */

#define MONITOR_IS_DEFAULT    0x01

/* 0x01 unused */

#define MONITOR_USE_READLINE  0x02

#define MONITOR_USE_CONTROL   0x04

#define MONITOR_USE_PRETTY    0x08

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -4094,7 +4094,7 @@ QemuOptsList qemu_mon_opts = { 
            .name = "chardev",

            .type = QEMU_OPT_STRING,

        },{

            .name = "default",

            .name = "default",  /* deprecated */

            .type = QEMU_OPT_BOOL,

        },{

            .name = "pretty",

qemu-options.hx

+4 −4
Original line number Diff line number Diff line
@@ -2239,7 +2239,7 @@ two serial ports and the QEMU monitor: 


@example

-chardev stdio,mux=on,id=char0 \

-mon chardev=char0,mode=readline,default \

-mon chardev=char0,mode=readline \

-serial chardev:char0 \

-serial chardev:char0

@end example
@@ -2250,7 +2250,7 @@ multiplexed between the QEMU monitor and a parallel port: 


@example

-chardev stdio,mux=on,id=char0 \

-mon chardev=char0,mode=readline,default \

-mon chardev=char0,mode=readline \

-parallel chardev:char0 \

-chardev tcp,...,mux=on,id=char1 \

-serial chardev:char1 \
@@ -3112,9 +3112,9 @@ Like -qmp but uses pretty JSON formatting. 
ETEXI



DEF("mon", HAS_ARG, QEMU_OPTION_mon, \

    "-mon [chardev=]name[,mode=readline|control][,default]\n", QEMU_ARCH_ALL)

    "-mon [chardev=]name[,mode=readline|control]\n", QEMU_ARCH_ALL)

STEXI

@item -mon [chardev=]name[,mode=readline|control][,default]

@item -mon [chardev=]name[,mode=readline|control]

@findex -mon

Setup monitor on chardev @var{name}.

ETEXI

vl.c

+3 −8
Original line number Diff line number Diff line
@@ -2408,8 +2408,9 @@ 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))

        flags |= MONITOR_IS_DEFAULT;

    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);
@@ -2428,16 +2429,12 @@ static void monitor_parse(const char *optarg, const char *mode, bool pretty) 
    QemuOpts *opts;

    const char *p;

    char label[32];

    int def = 0;



    if (strstart(optarg, "chardev:", &p)) {

        snprintf(label, sizeof(label), "%s", p);

    } else {

        snprintf(label, sizeof(label), "compat_monitor%d",

                 monitor_device_index);

        if (monitor_device_index == 0) {

            def = 1;

        }

        opts = qemu_chr_parse_compat(label, optarg);

        if (!opts) {

            error_report("parse error: %s", optarg);
@@ -2449,8 +2446,6 @@ static void monitor_parse(const char *optarg, const char *mode, bool pretty) 
    qemu_opt_set(opts, "mode", mode, &error_abort);

    qemu_opt_set(opts, "chardev", label, &error_abort);

    qemu_opt_set_bool(opts, "pretty", pretty, &error_abort);

    if (def)

        qemu_opt_set(opts, "default", "on", &error_abort);

    monitor_device_index++;

}