diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-10-25 15:11:32 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-10-27 19:05:23 +0200 |
| commit | fcfcd8ffccd81b6fc13a730e2a75cefc5d1eb752 (patch) | |
| tree | 216b76b3155fc25db9e711f5f4da4b5b410999d2 /block/nbd.c | |
| parent | 7edca33804f9b6948a65c04f969facf02a59e6fe (diff) | |
block/nbd: Use qdict_put()
Instead of inlining this nice macro (i.e. resorting to
qdict_put_obj(..., QOBJECT(...))), use it.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/nbd.c')
| -rw-r--r-- | block/nbd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/block/nbd.c b/block/nbd.c index c77a9699fe..c539fb5ff2 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -446,7 +446,7 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) QDict *opts = qdict_new(); const char *port = s->port ?: stringify(NBD_DEFAULT_PORT); - qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("nbd"))); + qdict_put(opts, "driver", qstring_from_str("nbd")); if (s->path && s->export) { snprintf(bs->exact_filename, sizeof(bs->exact_filename), @@ -463,17 +463,16 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) } if (s->path) { - qdict_put_obj(opts, "path", QOBJECT(qstring_from_str(s->path))); + qdict_put(opts, "path", qstring_from_str(s->path)); } else { - qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(s->host))); - qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(port))); + qdict_put(opts, "host", qstring_from_str(s->host)); + qdict_put(opts, "port", qstring_from_str(port)); } if (s->export) { - qdict_put_obj(opts, "export", QOBJECT(qstring_from_str(s->export))); + qdict_put(opts, "export", qstring_from_str(s->export)); } if (s->tlscredsid) { - qdict_put_obj(opts, "tls-creds", - QOBJECT(qstring_from_str(s->tlscredsid))); + qdict_put(opts, "tls-creds", qstring_from_str(s->tlscredsid)); } bs->full_open_options = opts; |