ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdict: remove useless cast 

Re-run Coccinelle script scripts/coccinelle/qobject.cocci

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20180323143202.28879-5-lvivier@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Laurent Vivier 2018-03-23 15:32:01 +01:00 committed by Eric Blake
parent 710c263407
commit 625eaca9e5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/nvme.c
View File

@ -695,12 +695,11 @@ static void nvme_parse_filename(const char *filename, QDict *options,
unsigned long ns; unsigned long ns;
const char *slash = strchr(tmp, '/'); const char *slash = strchr(tmp, '/');
if (!slash) { if (!slash) {
qdict_put(options, NVME_BLOCK_OPT_DEVICE, qdict_put_str(options, NVME_BLOCK_OPT_DEVICE, tmp);
qstring_from_str(tmp));
return; return;
} }
device = g_strndup(tmp, slash - tmp); 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); g_free(device);
namespace = slash + 1; namespace = slash + 1;
if (*namespace && qemu_strtoul(namespace, NULL, 10, &ns)) { if (*namespace && qemu_strtoul(namespace, NULL, 10, &ns)) {
@ -708,8 +707,8 @@ static void nvme_parse_filename(const char *filename, QDict *options,
namespace); namespace);
return; return;
} }
qdict_put(options, NVME_BLOCK_OPT_NAMESPACE, qdict_put_str(options, NVME_BLOCK_OPT_NAMESPACE,
qstring_from_str(*namespace ? namespace : "1")); *namespace ? namespace : "1");
} }
} }
@ -1082,7 +1081,7 @@ static void nvme_refresh_filename(BlockDriverState *bs, QDict *opts)
bs->drv->format_name); 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; bs->full_open_options = opts;
} }

2
monitor.c
View File

@ -4315,7 +4315,7 @@ static QObject *get_qmp_greeting(Monitor *mon)
/* Monitors that are not using IOThread won't support OOB */ /* Monitors that are not using IOThread won't support OOB */
continue; 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}}", return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': %p}}",