From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ansCS-0007Lo-Cd for qemu-devel@nongnu.org; Wed, 06 Apr 2016 14:29:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ansCR-0006uV-Hb for qemu-devel@nongnu.org; Wed, 06 Apr 2016 14:29:08 -0400 From: Max Reitz Date: Wed, 6 Apr 2016 20:28:41 +0200 Message-Id: <1459967330-4573-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1459967330-4573-1-git-send-email-mreitz@redhat.com> References: <1459967330-4573-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 05/14] block/nbd: Use qdict_put() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , Paolo Bonzini , Luiz Capitulino Instead of inlining this nice macro (i.e. resorting to qdict_put_obj(..., QOBJECT(...))), use it. Signed-off-by: Max Reitz --- block/nbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index efa5d3d..d12bcc6 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -437,7 +437,7 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) port = stringify(NBD_DEFAULT_PORT); } - qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("nbd"))); + qdict_put(opts, "driver", qstring_from_str("nbd")); if (path && export) { snprintf(bs->exact_filename, sizeof(bs->exact_filename), @@ -454,16 +454,16 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) } if (path) { - qdict_put_obj(opts, "path", QOBJECT(qstring_from_str(path))); + qdict_put(opts, "path", qstring_from_str(path)); } else { - qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(host))); - qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(port))); + qdict_put(opts, "host", qstring_from_str(host)); + qdict_put(opts, "port", qstring_from_str(port)); } if (export) { - qdict_put_obj(opts, "export", QOBJECT(qstring_from_str(export))); + qdict_put(opts, "export", qstring_from_str(export)); } if (tlscreds) { - qdict_put_obj(opts, "tls-creds", QOBJECT(qstring_from_str(tlscreds))); + qdict_put(opts, "tls-creds", qstring_from_str(tlscreds)); } bs->full_open_options = opts; -- 2.8.0