From 46f5ac205a9dc5e2c24274c7df371509a286281f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 27 Apr 2017 16:58:17 -0500 Subject: qobject: Use simpler QDict/QList scalar insertion macros We now have macros in place to make it less verbose to add a scalar to QDict and QList, so use them. Patch created mechanically via: spatch --sp-file scripts/coccinelle/qobject.cocci \ --macro-file scripts/cocci-macro-file.h --dir . --in-place then touched up manually to fix a couple of '?:' back to original spacing, as well as avoiding a long line in monitor.c. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster Message-Id: <20170427215821.19397-7-eblake@redhat.com> Reviewed-by: Stefan Hajnoczi Reviewed-by: Alberto Garcia Signed-off-by: Markus Armbruster --- block/vxhs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'block/vxhs.c') diff --git a/block/vxhs.c b/block/vxhs.c index 9ffe9d3814..75cc6c8672 100644 --- a/block/vxhs.c +++ b/block/vxhs.c @@ -182,15 +182,15 @@ static int vxhs_parse_uri(const char *filename, QDict *options) return -EINVAL; } - qdict_put(options, VXHS_OPT_SERVER".host", qstring_from_str(uri->server)); + qdict_put_str(options, VXHS_OPT_SERVER ".host", uri->server); if (uri->port) { port = g_strdup_printf("%d", uri->port); - qdict_put(options, VXHS_OPT_SERVER".port", qstring_from_str(port)); + qdict_put_str(options, VXHS_OPT_SERVER ".port", port); g_free(port); } - qdict_put(options, "vdisk-id", qstring_from_str(uri->path)); + qdict_put_str(options, "vdisk-id", uri->path); trace_vxhs_parse_uri_hostinfo(uri->server, uri->port); uri_free(uri); -- cgit v1.2.1