* Laurent Vivier (lviv...@redhat.com) wrote:
> Re-run Coccinelle script scripts/coccinelle/qobject.cocci
>
> Signed-off-by: Laurent Vivier <lviv...@redhat.com>
> ---
> block/nvme.c | 11 +++++------
> monitor.c | 2 +-
> 2 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/block/nvme.c b/block/nvme.c
> index 8bca57aae6..c4f3a7bc94 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -695,12 +695,11 @@ static void nvme_parse_filename(const char *filename,
> QDict *options,
> unsigned long ns;
> const char *slash = strchr(tmp, '/');
> if (!slash) {
> - qdict_put(options, NVME_BLOCK_OPT_DEVICE,
> - qstring_from_str(tmp));
> + qdict_put_str(options, NVME_BLOCK_OPT_DEVICE, tmp);
> return;
> }
> device = g_strndup(tmp, slash - tmp);
> - qdict_put(options, NVME_BLOCK_OPT_DEVICE, qstring_from_str(device));
> + qdict_put_str(options, NVME_BLOCK_OPT_DEVICE, device);
> g_free(device);
> namespace = slash + 1;
> if (*namespace && qemu_strtoul(namespace, NULL, 10, &ns)) {
> @@ -708,8 +707,8 @@ static void nvme_parse_filename(const char *filename,
> QDict *options,
> namespace);
> return;
> }
> - qdict_put(options, NVME_BLOCK_OPT_NAMESPACE,
> - qstring_from_str(*namespace ? namespace : "1"));
> + qdict_put_str(options, NVME_BLOCK_OPT_NAMESPACE,
> + *namespace ? namespace : "1");
> }
> }
>
> @@ -1082,7 +1081,7 @@ static void nvme_refresh_filename(BlockDriverState *bs,
> QDict *opts)
> bs->drv->format_name);
> }
>
> - qdict_put(opts, "driver", qstring_from_str(bs->drv->format_name));
> + qdict_put_str(opts, "driver", bs->drv->format_name);
> bs->full_open_options = opts;
> }
>
> diff --git a/monitor.c b/monitor.c
> index 6ccd2fc089..6e7667d82f 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4316,7 +4316,7 @@ static QObject *get_qmp_greeting(Monitor *mon)
> /* Monitors that are not using IOThread won't support OOB */
> continue;
> }
> - qlist_append(cap_list, qstring_from_str(QMPCapability_str(cap)));
> + qlist_append_str(cap_list, QMPCapability_str(cap));
> }
>
> return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': %p}}",
For monitor:
Acked-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> --
> 2.14.3
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
