Commit 28934e0c authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

QemuOpts: Simplify qemu_opts_to_qdict() 



Noticed while investigating Coccinelle cleanups. There is no need
for a temporary variable when we can use the new macro to do the
same thing with less typing.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20170427215821.19397-9-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent ff6ed714

util/qemu-option.c

+1 −3
Original line number Diff line number Diff line
@@ -1054,7 +1054,6 @@ void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp) 
QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict)

{

    QemuOpt *opt;

    QObject *val;



    if (!qdict) {

        qdict = qdict_new();
@@ -1063,8 +1062,7 @@ QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict) 
        qdict_put_str(qdict, "id", opts->id);

    }

    QTAILQ_FOREACH(opt, &opts->head, next) {

        val = QOBJECT(qstring_from_str(opt->str));

        qdict_put_obj(qdict, opt->name, val);

        qdict_put_str(qdict, opt->name, opt->str);

    }

    return qdict;

}