[15/36] blockdev: Use simpler QAPI_TO_QOBJECT()

Commit Message

Eric Blake Nov. 30, 2016, 7:44 p.m. UTC

Use the new macro to avoid some boilerplate.

Signed-off-by: Eric Blake <[e-mail]>
---
 blockdev.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Patch

diff --git a/blockdev.c b/blockdev.c
index 2802cea..18a3212 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3801,29 +3801,27 @@  void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
 {
     BlockDriverState *bs;
     QObject *obj;
-    Visitor *v = qobject_output_visitor_new(&obj);
     QDict *qdict;
     Error *local_err = NULL;

-    visit_type_BlockdevOptions(v, NULL, &options, &local_err);
+    obj = QAPI_TO_QOBJECT(BlockdevOptions, options, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
-        goto fail;
+        return;
     }

-    visit_complete(v, &obj);
     qdict = qobject_to_qdict(obj);

     qdict_flatten(qdict);

     if (!qdict_get_try_str(qdict, "node-name")) {
         error_setg(errp, "'node-name' must be specified for the root node");
-        goto fail;
+        return;
     }

     bs = bds_tree_init(qdict, errp);
     if (!bs) {
-        goto fail;
+        return;
     }

     QTAILQ_INSERT_TAIL(&monitor_bdrv_states, bs, monitor_list);
@@ -3832,11 +3830,7 @@  void qmp_blockdev_add(BlockdevOptions *options, Error **errp)
         QTAILQ_REMOVE(&monitor_bdrv_states, bs, monitor_list);
         bdrv_unref(bs);
         error_setg(errp, "blockdev-add doesn't support encrypted devices");
-        goto fail;
     }
-
-fail:
-    visit_free(v);
 }

 void qmp_x_blockdev_del(const char *node_name, Error **errp)