[Qemu-devel] [PATCH 5/5] blockdev: Use simpler QAPI_TO_QOBJECT()

[Eric Blake]

Use the new macro to avoid some boilerplate.

Signed-off-by: Eric Blake <address@hidden>
---
 blockdev.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 7f53cc8bb3..bf26c38195 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3884,35 +3884,30 @@ 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);
-
-fail:
-    visit_free(v);
 }

 void qmp_blockdev_del(const char *node_name, Error **errp)
-- 
2.13.3