From 625eaca9e516234ac70feeee5c4dad394c970820 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 23 Mar 2018 15:32:01 +0100 Subject: qdict: remove useless cast Re-run Coccinelle script scripts/coccinelle/qobject.cocci Signed-off-by: Laurent Vivier Message-Id: <20180323143202.28879-5-lvivier@redhat.com> Reviewed-by: Eric Blake Acked-by: Dr. David Alan Gilbert Acked-by: Fam Zheng Signed-off-by: Eric Blake --- block/nvme.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'block/nvme.c') 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; } -- cgit v1.2.1