From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ez2q1-000289-BB for qemu-devel@nongnu.org; Thu, 22 Mar 2018 12:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ez2px-0007Qn-3p for qemu-devel@nongnu.org; Thu, 22 Mar 2018 12:13:13 -0400 From: Laurent Vivier Date: Thu, 22 Mar 2018 17:12:25 +0100 Message-Id: <20180322161226.29796-4-lvivier@redhat.com> In-Reply-To: <20180322161226.29796-1-lvivier@redhat.com> References: <20180322161226.29796-1-lvivier@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] qdict: remove useless cast List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Paolo Bonzini , David Gibson , Kevin Wolf , Richard Henderson , qemu-arm@nongnu.org, Eric Blake , Jason Wang , Max Reitz , Fam Zheng , qemu-trivial@nongnu.org, Alexander Graf , qemu-ppc@nongnu.org, Peter Maydell , Alberto Garcia , qemu-block@nongnu.org, Igor Mitsyanko , Yongbok Kim , "Michael S. Tsirkin" , Aurelien Jarno , Eduardo Habkost , Max Filippov , Markus Armbruster , Laurent Vivier Re-run Coccinelle script scripts/coccinelle/qobject.cocci Signed-off-by: Laurent Vivier --- 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}}", -- 2.14.3