diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-06-14 21:14:33 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-06-15 14:49:44 +0200 |
| commit | af91062ee1408f7f5bb58389d355d29a5040c648 (patch) | |
| tree | cf745cb42a9189cef01e0a14d1d8543e123de892 /block/rbd.c | |
| parent | 92adf9dbcd3cf9cedddae995b04a99f5c42ae08c (diff) | |
block: Factor out qobject_input_visitor_new_flat_confused()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/rbd.c')
| -rw-r--r-- | block/rbd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block/rbd.c b/block/rbd.c index 09720e97c0..82346a2a5e 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -630,7 +630,6 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, BDRVRBDState *s = bs->opaque; BlockdevOptionsRbd *opts = NULL; Visitor *v; - QObject *crumpled = NULL; const QDictEntry *e; Error *local_err = NULL; char *keypairs, *secretid; @@ -647,16 +646,14 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, } /* Convert the remaining options into a QAPI object */ - crumpled = qdict_crumple_for_keyval_qiv(options, errp); - if (crumpled == NULL) { + v = qobject_input_visitor_new_flat_confused(options, errp); + if (!v) { r = -EINVAL; goto out; } - v = qobject_input_visitor_new_keyval(crumpled); visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err); visit_free(v); - qobject_unref(crumpled); if (local_err) { error_propagate(errp, local_err); |