Am 21.05.2021 um 12:21 hat Paolo Bonzini geschrieben:
> Change the parser to put the values into a QDict and pass them
> to a callback. qemu_config_parse's QemuOpts creation is
> itself turned into a callback function.
>
> This is useful for -readconfig to support keyval-based options;
> getting a QDict from the parser removes a roundtrip from
> QDict to QemuOpts and then back to QDict.
>
> Unfortunately there is a disadvantage in that semantic errors will
> point to the last line of the group, because the entries of the QDict
> do not have a location attached.
>
> Cc: Kevin Wolf <kw...@redhat.com>
> Cc: Markus Armbruster <arm...@redhat.com>
> Cc: qemu-sta...@nongnu.org
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> v1->v2: check for unrecognized entries in the QDict, move a loc_pop for
> better error messages
>
> v2->v3: fix error propagation
> +void qemu_config_do_parse(const char *group, QDict *qdict, void *opaque,
> Error **errp)
> +{
> + QemuOptsList **lists = opaque;
> + const char *id = qdict_get_try_str(qdict, "id");
> + QemuOptsList *list;
> + QemuOpts *opts;
> + const QDictEntry *unrecognized;
> +
> + list = find_list(lists, group, errp);
> + if (!list) {
> + return;
> + }
> +
> + opts = qemu_opts_create(list, id, 1, errp);
> + if (!opts) {
> + return;
> + }
> + qemu_opts_absorb_qdict(opts, qdict, errp);
> + if (errp) {
This doesn't do what you wanted.
*errp would be be better, but you also need ERRP_GUARD() then.
The other option would be using the return value of
qemu_opts_absorb_qdict().
> + return;
> + }
> + unrecognized = qdict_first(qdict);
> + if (unrecognized) {
> + error_setg(errp, QERR_INVALID_PARAMETER, unrecognized->key);
> + qemu_opts_del(opts);
> + }
> +}
Kevin
