All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Luiz Capitulino <lcapitulino@redhat.com>
Subject: [Qemu-devel] [PATCH v3 05/14] block/nbd: Use qdict_put()
Date: Wed,  6 Apr 2016 20:28:41 +0200	[thread overview]
Message-ID: <1459967330-4573-6-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1459967330-4573-1-git-send-email-mreitz@redhat.com>

Instead of inlining this nice macro (i.e. resorting to
qdict_put_obj(..., QOBJECT(...))), use it.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 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

  parent reply	other threads:[~2016-04-06 18:29 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06 18:28 [Qemu-devel] [PATCH v3 for-2.7 00/14] qapi: Allow blockdev-add for NBD Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 01/14] qdict: Add qdict_change_key() Max Reitz
2016-06-14 22:03   ` Eric Blake
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 02/14] block/nbd: Drop trailing "." in error messages Max Reitz
2016-06-14 22:04   ` Eric Blake
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 03/14] block/nbd: Reject port parameter without host Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 04/14] block/nbd: Default port in nbd_refresh_filename() Max Reitz
2016-06-14 22:39   ` Eric Blake
2016-04-06 18:28 ` Max Reitz [this message]
2016-06-14 22:40   ` [Qemu-devel] [PATCH v3 05/14] block/nbd: Use qdict_put() Eric Blake
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 06/14] block/nbd: Add nbd_has_filename_options_conflict() Max Reitz
2016-06-14 22:54   ` Eric Blake
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 07/14] block/nbd: "address" in nbd_refresh_filename() Max Reitz
2016-06-14 23:03   ` Eric Blake
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 08/14] block/nbd: Accept SocketAddress Max Reitz
2016-06-14 23:14   ` Eric Blake
2016-06-15 14:40     ` Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 09/14] block/nbd: Use SocketAddress options Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 10/14] qapi: Allow blockdev-add for NBD Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 11/14] iotests.py: Add qemu_nbd function Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 12/14] iotests.py: Allow concurrent qemu instances Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 13/14] socket_scm_helper: Accept fd directly Max Reitz
2016-04-06 18:28 ` [Qemu-devel] [PATCH v3 14/14] iotests: Add test for NBD's blockdev-add interface Max Reitz
2016-05-03 13:51 ` [Qemu-devel] [PATCH v3 for-2.7 00/14] qapi: Allow blockdev-add for NBD Max Reitz
2016-05-03 15:23 ` Kevin Wolf
2016-06-14 22:42   ` Eric Blake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459967330-4573-6-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.