diff options
| author | Eric Blake <eblake@redhat.com> | 2016-06-09 10:48:38 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-06 10:52:04 +0200 |
| commit | b70ce1018a251c0c33498d9c927a07cade655a5e (patch) | |
| tree | 6f11b7166523750427c3bdf8f468567a80a0aea5 /util | |
| parent | 7a0525c7be6b38d32d586e3fd12e7377ded21faa (diff) | |
qmp-input-visitor: Favor new visit_free() function
Now that we have a polymorphic visit_free(), we no longer need
qmp_input_visitor_cleanup(); which in turn means we no longer
need to return a subtype from qmp_input_visitor_new() nor a
public upcast function.
Generated code changes to qmp-marshal.c look like:
|@@ -52,11 +52,10 @@ void qmp_marshal_add_fd(QDict *args, QOb
| {
| Error *err = NULL;
| AddfdInfo *retval;
|- QmpInputVisitor *qiv = qmp_input_visitor_new(QOBJECT(args), true);
| Visitor *v;
| q_obj_add_fd_arg arg = {0};
|
|- v = qmp_input_get_visitor(qiv);
|+ v = qmp_input_visitor_new(QOBJECT(args), true);
| visit_start_struct(v, NULL, NULL, 0, &err);
| if (err) {
| goto out;
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1465490926-28625-8-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/qemu-sockets.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index cc2b043907..3677cd21dc 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1148,7 +1148,6 @@ void qapi_copy_SocketAddress(SocketAddress **p_dest, SocketAddress *src) { QmpOutputVisitor *qov; - QmpInputVisitor *qiv; Visitor *ov, *iv; QObject *obj; @@ -1163,10 +1162,9 @@ void qapi_copy_SocketAddress(SocketAddress **p_dest, return; } - qiv = qmp_input_visitor_new(obj, true); - iv = qmp_input_get_visitor(qiv); + iv = qmp_input_visitor_new(obj, true); visit_type_SocketAddress(iv, NULL, p_dest, &error_abort); - qmp_input_visitor_cleanup(qiv); + visit_free(iv); qobject_decref(obj); } |