Commit 70b94331 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

QemuOpts: Wean off qerror_report_err() 



qerror_report_err() is a transitional interface to help with
converting existing monitor commands to QMP.  It should not be used
elsewhere.

The only remaining user in qemu-option.c is qemu_opts_parse().  Is it
used in QMP context?  If not, we can simply replace
qerror_report_err() by error_report_err().

The uses in qemu-img.c, qemu-io.c, qemu-nbd.c and under tests/ are
clearly not in QMP context.

The uses in vl.c aren't either, because the only QMP command handlers
there are qmp_query_status() and qmp_query_machines(), and they don't
call it.

Remaining uses:

* drive_def(): Command line -drive and such, HMP drive_add and pci_add

* hmp_chardev_add(): HMP chardev-add

* monitor_parse_command(): HMP core

* tmp_config_parse(): Command line -tpmdev

* net_host_device_add(): HMP host_net_add

* net_client_parse(): Command line -net and -netdev

* qemu_global_option(): Command line -global

* vnc_parse_func(): Command line -display, -vnc, default display, HMP
  change, QMP change.  Bummer.

* qemu_pci_hot_add_nic(): HMP pci_add

* usb_net_init(): Command line -usbdevice, HMP usb_add

Propagate errors through qemu_opts_parse().  Create a convenience
function qemu_opts_parse_noisily() that passes errors to
error_report_err().  Switch all non-QMP users outside tests to it.

That leaves vnc_parse_func().  Propagate errors through it.  Since I'm
touching it anyway, rename it to vnc_parse().

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent f006cf7f

blockdev.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int drive_index_to_unit_id(BlockInterfaceType type, int index) 


QemuOpts *drive_def(const char *optstr)

{

    return qemu_opts_parse(qemu_find_opts("drive"), optstr, 0);

    return qemu_opts_parse_noisily(qemu_find_opts("drive"), optstr, false);

}



QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,7 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict) 
    Error *err = NULL;

    QemuOpts *opts;



    opts = qemu_opts_parse(qemu_find_opts("chardev"), args, 1);

    opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), args, true);

    if (opts == NULL) {

        error_setg(&err, "Parsing chardev args failed");

    } else {

hw/usb/dev-network.c

+1 −1
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) 
    QemuOpts *opts;

    int idx;



    opts = qemu_opts_parse(qemu_find_opts("net"), cmdline, 0);

    opts = qemu_opts_parse_noisily(qemu_find_opts("net"), cmdline, false);

    if (!opts) {

        return NULL;

    }

include/qemu/option.h

+4 −1
Original line number Diff line number Diff line
@@ -119,7 +119,10 @@ void qemu_opts_del(QemuOpts *opts); 
void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp);

void qemu_opts_do_parse(QemuOpts *opts, const char *params,

                        const char *firstname, Error **errp);

QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int permit_abbrev);

QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params,

                                  bool permit_abbrev);

QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params,

                          bool permit_abbrev, Error **errp);

void qemu_opts_set_defaults(QemuOptsList *list, const char *params,

                            int permit_abbrev);

QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,

include/ui/console.h

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ char *vnc_display_local_addr(const char *id); 
#ifdef CONFIG_VNC

int vnc_display_password(const char *id, const char *password);

int vnc_display_pw_expire(const char *id, time_t expires);

QemuOpts *vnc_parse_func(const char *str);

QemuOpts *vnc_parse(const char *str, Error **errp);

int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);

#else

static inline int vnc_display_password(const char *id, const char *password)