diff mbox

[13/36] nfs: Use simpler QAPI_TO_QOBJECT()

Message ID 1480535094-23831-14-git-send-email-eblake@redhat.com (mailing list archive)
State New, archived
Headers show

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 <eblake@redhat.com>
---
 block/nfs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff mbox

Patch

diff --git a/block/nfs.c b/block/nfs.c
index f8ba5cc..71cc746 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -766,7 +766,6 @@  static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)
     NFSClient *client = bs->opaque;
     QDict *opts = qdict_new();
     QObject *server_qdict;
-    Visitor *ov;

     qdict_put_str(opts, "driver", "nfs");

@@ -787,9 +786,7 @@  static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)
                  "nfs://%s%s", client->server->host, client->path);
     }

-    ov = qobject_output_visitor_new(&server_qdict);
-    visit_type_NFSServer(ov, NULL, &client->server, &error_abort);
-    visit_complete(ov, &server_qdict);
+    server_qdict = QAPI_TO_QOBJECT(NFSServer, client->server, &error_abort);
     assert(qobject_type(server_qdict) == QTYPE_QDICT);

     qdict_put_obj(opts, "server", server_qdict);
@@ -814,7 +811,6 @@  static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)
         qdict_put_int(opts, "debug", client->debug);
     }

-    visit_free(ov);
     qdict_flatten(opts);
     bs->full_open_options = opts;
 }