| Message ID | 20170411185034.13460-12-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 04/11/2017 03:50 PM, Eric Blake wrote: > 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: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > util/qemu-option.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/util/qemu-option.c b/util/qemu-option.c > index a36cafa..5977bfc 100644 > --- a/util/qemu-option.c > +++ b/util/qemu-option.c > @@ -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; > } >
diff --git a/util/qemu-option.c b/util/qemu-option.c index a36cafa..5977bfc 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -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; }
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: Eric Blake <eblake@redhat.com> --- util/qemu-option.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)