From nobody Sun Oct 5 19:09:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522161187678677.4765598539341; Tue, 27 Mar 2018 07:33:07 -0700 (PDT) Received: from localhost ([::1]:34619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0pes-0000YK-Nl for importer@patchew.org; Tue, 27 Mar 2018 10:33:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0pcZ-0007f8-8p for qemu-devel@nongnu.org; Tue, 27 Mar 2018 10:30:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0pcW-00054C-Lw for qemu-devel@nongnu.org; Tue, 27 Mar 2018 10:30:43 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60626 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f0pcH-0004xI-EB; Tue, 27 Mar 2018 10:30:25 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03CBA401DEA6; Tue, 27 Mar 2018 14:30:25 +0000 (UTC) Received: from red.redhat.com (ovpn-121-135.rdu2.redhat.com [10.10.121.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF58F8442C; Tue, 27 Mar 2018 14:30:21 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 27 Mar 2018 09:30:05 -0500 Message-Id: <20180327143014.1767669-6-eblake@redhat.com> In-Reply-To: <20180327143014.1767669-1-eblake@redhat.com> References: <20180327143014.1767669-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 27 Mar 2018 14:30:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 27 Mar 2018 14:30:25 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 05/14] qdict: remove useless cast X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Kevin Wolf , Fam Zheng , "open list:NVMe Block Driver" , Markus Armbruster , "Dr. David Alan Gilbert" , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier 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 +++++------ monitor.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 8bca57aae69..c4f3a7bc94a 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 =3D 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 =3D 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 =3D slash + 1; if (*namespace && qemu_strtoul(namespace, NULL, 10, &ns)) { @@ -708,8 +707,8 @@ static void nvme_parse_filename(const char *filename, Q= Dict *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 *b= s, 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 =3D opts; } diff --git a/monitor.c b/monitor.c index 77f4c41cfa6..de709fc2e5d 100644 --- a/monitor.c +++ b/monitor.c @@ -4315,7 +4315,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}= }", --=20 2.14.3