diff options
author | Eric Blake <eblake@redhat.com> | 2016-06-09 10:48:35 -0600 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-07-06 10:52:04 +0200 |
commit | 2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c (patch) | |
tree | 170fd114e761c875bda5438718a82c22fb4b2cec /qapi/opts-visitor.c | |
parent | 1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271 (diff) | |
download | qemu-2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c.zip qemu-2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c.tar.gz qemu-2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c.tar.bz2 |
qapi: Add new visit_free() function
Making each visitor provide its own (awkwardly-named) FOO_cleanup()
is unusual, when we can instead have a polymorphic visit_free()
interface. Over the next few patches, we can use the polymorphic
functions to eliminate the need for a FOO_get_visitor() function
for accessing specific visitor functionality, once everything can
be accessed directly through the Visitor* interfaces.
The dealloc visitor is the first one converted to completely use
the new entry point, since qapi_dealloc_visitor_cleanup() was the
only reason that qapi_dealloc_get_visitor() existed, and only
generated and testsuite code was even using it. With the new
visit_free() entry point in place, we no longer need to expose
the QapiDeallocVisitor subtype through qapi_dealloc_visitor_new(),
and can get by with less generated code, with diffs that look like:
| void qapi_free_ACPIOSTInfo(ACPIOSTInfo *obj)
| {
|- QapiDeallocVisitor *qdv;
| Visitor *v;
|
| if (!obj) {
| return;
| }
|
|- qdv = qapi_dealloc_visitor_new();
|- v = qapi_dealloc_get_visitor(qdv);
|+ v = qapi_dealloc_visitor_new();
| visit_type_ACPIOSTInfo(v, NULL, &obj, NULL);
|- qapi_dealloc_visitor_cleanup(qdv);
|+ visit_free(v);
|}
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1465490926-28625-5-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'qapi/opts-visitor.c')
-rw-r--r-- | qapi/opts-visitor.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index dcfbf92..72c95ac 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -513,6 +513,15 @@ opts_optional(Visitor *v, const char *name, bool *present) } +static void +opts_free(Visitor *v) +{ + OptsVisitor *ov = to_ov(v); + + opts_visitor_cleanup(ov); +} + + OptsVisitor * opts_visitor_new(const QemuOpts *opts) { @@ -540,6 +549,7 @@ opts_visitor_new(const QemuOpts *opts) * skip some mandatory methods... */ ov->visitor.optional = &opts_optional; + ov->visitor.free = opts_free; ov->opts_root = opts; |