[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/16] block/nbd: Use qdict_put()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 07/16] block/nbd: Use qdict_put() |
Date: |
Tue, 1 Mar 2016 00:19:24 +0100 |
Instead of inlining this nice macro (i.e. resorting to
qdict_put_obj(..., QOBJECT(...))), use it.
Signed-off-by: Max Reitz <address@hidden>
---
block/nbd.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 8d9a217..145db39 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -415,7 +415,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),
@@ -432,16 +432,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.7.1
- [Qemu-devel] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 01/16] qdict: Add qdict_change_key(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 02/16] qdict: Add qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 03/16] check-qdict: Add a test for qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 04/16] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 05/16] block/nbd: Reject port parameter without host, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 07/16] block/nbd: Use qdict_put(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 08/16] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 10/16] block/nbd: Accept SocketAddress, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 09/16] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 11/16] block/nbd: Use SocketAddress options, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 15/16] socket_scm_helper: Accept fd directly, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 12/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 13/16] iotests.py: Add qemu_nbd function, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 14/16] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/02/29
- Re: [Qemu-devel] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Eric Blake, 2016/02/29