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 /qom/qom-qobject.c | |
| parent | 7a0525c7be6b38d32d586e3fd12e7377ded21faa (diff) | |
| download | qemu-b70ce1018a251c0c33498d9c927a07cade655a5e.tar.gz qemu-b70ce1018a251c0c33498d9c927a07cade655a5e.tar.bz2 qemu-b70ce1018a251c0c33498d9c927a07cade655a5e.zip | |
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 'qom/qom-qobject.c')
| -rw-r--r-- | qom/qom-qobject.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c index b66088d730..c3c9188d00 100644 --- a/qom/qom-qobject.c +++ b/qom/qom-qobject.c @@ -21,12 +21,11 @@ void object_property_set_qobject(Object *obj, QObject *value, const char *name, Error **errp) { - QmpInputVisitor *qiv; + Visitor *v; /* TODO: Should we reject, rather than ignore, excess input? */ - qiv = qmp_input_visitor_new(value, false); - object_property_set(obj, qmp_input_get_visitor(qiv), name, errp); - - qmp_input_visitor_cleanup(qiv); + v = qmp_input_visitor_new(value, false); + object_property_set(obj, v, name, errp); + visit_free(v); } QObject *object_property_get_qobject(Object *obj, const char *name, |