[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 for-2.9 07/10] rbd: Clean up qemu_rbd_create()'s
From: |
Markus Armbruster |
Subject: |
[Qemu-block] [PATCH v4 for-2.9 07/10] rbd: Clean up qemu_rbd_create()'s detour through QemuOpts |
Date: |
Tue, 28 Mar 2017 10:56:05 +0200 |
The conversion from QDict to QemuOpts is pointless. Simply get the
stuff straight from the QDict.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block/rbd.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index b2afe07..16ea60a 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -376,7 +376,6 @@ static int qemu_rbd_create(const char *filename, QemuOpts
*opts, Error **errp)
rados_t cluster;
rados_ioctx_t io_ctx;
QDict *options = NULL;
- QemuOpts *rbd_opts = NULL;
int ret = 0;
secretid = qemu_opt_get(opts, "password-secret");
@@ -407,19 +406,11 @@ static int qemu_rbd_create(const char *filename, QemuOpts
*opts, Error **errp)
goto exit;
}
- rbd_opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
- qemu_opts_absorb_qdict(rbd_opts, options, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- ret = -EINVAL;
- goto exit;
- }
-
- pool = qemu_opt_get(rbd_opts, "pool");
- conf = qemu_opt_get(rbd_opts, "conf");
- clientname = qemu_opt_get(rbd_opts, "user");
- name = qemu_opt_get(rbd_opts, "image");
- keypairs = qemu_opt_get(rbd_opts, "=keyvalue-pairs");
+ pool = qdict_get_try_str(options, "pool");
+ conf = qdict_get_try_str(options, "conf");
+ clientname = qdict_get_try_str(options, "user");
+ name = qdict_get_try_str(options, "image");
+ keypairs = qdict_get_try_str(options, "=keyvalue-pairs");
ret = rados_create(&cluster, clientname);
if (ret < 0) {
@@ -470,7 +461,6 @@ shutdown:
exit:
QDECREF(options);
- qemu_opts_del(rbd_opts);
return ret;
}
--
2.7.4
- [Qemu-block] [PATCH v4 for-2.9 00/10] rbd: Clean up API and code, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 04/10] rbd: Clean up after the previous commit, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 02/10] rbd: Fix to cleanly reject -drive without pool or image, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 05/10] rbd: Don't accept -drive driver=rbd, keyvalue-pairs=..., Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 01/10] rbd: Reject -blockdev server.*.{numeric, to, ipv4, ipv6}, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 07/10] rbd: Clean up qemu_rbd_create()'s detour through QemuOpts,
Markus Armbruster <=
- [Qemu-block] [PATCH v4 for-2.9 09/10] rbd: Revert -blockdev parameter password-secret, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 08/10] rbd: Revert -blockdev and -drive parameter auth-supported, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 10/10] rbd: Fix bugs around -drive parameter "server", Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 03/10] rbd: Don't limit length of parameter values, Markus Armbruster, 2017/03/28
- [Qemu-block] [PATCH v4 for-2.9 06/10] rbd: Clean up runtime_opts, fix -drive to reject filename, Markus Armbruster, 2017/03/28
- Re: [Qemu-block] [PATCH v4 for-2.9 00/10] rbd: Clean up API and code, Jeff Cody, 2017/03/28