mirror of
https://github.com/xemu-project/xemu.git
synced 2024-12-30 00:04:16 +00:00
2c0ef9f411
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>
140 lines
3.6 KiB
C
140 lines
3.6 KiB
C
/*
|
|
* Dealloc Visitor
|
|
*
|
|
* Copyright (C) 2012-2016 Red Hat, Inc.
|
|
* Copyright IBM, Corp. 2011
|
|
*
|
|
* Authors:
|
|
* Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/dealloc-visitor.h"
|
|
#include "qemu/queue.h"
|
|
#include "qemu-common.h"
|
|
#include "qapi/qmp/types.h"
|
|
#include "qapi/visitor-impl.h"
|
|
|
|
struct QapiDeallocVisitor
|
|
{
|
|
Visitor visitor;
|
|
};
|
|
|
|
static void qapi_dealloc_start_struct(Visitor *v, const char *name, void **obj,
|
|
size_t unused, Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_end_struct(Visitor *v, void **obj)
|
|
{
|
|
if (obj) {
|
|
g_free(*obj);
|
|
}
|
|
}
|
|
|
|
static void qapi_dealloc_start_alternate(Visitor *v, const char *name,
|
|
GenericAlternate **obj, size_t size,
|
|
bool promote_int, Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_end_alternate(Visitor *v, void **obj)
|
|
{
|
|
if (obj) {
|
|
g_free(*obj);
|
|
}
|
|
}
|
|
|
|
static void qapi_dealloc_start_list(Visitor *v, const char *name,
|
|
GenericList **list, size_t size,
|
|
Error **errp)
|
|
{
|
|
}
|
|
|
|
static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList *tail,
|
|
size_t size)
|
|
{
|
|
GenericList *next = tail->next;
|
|
g_free(tail);
|
|
return next;
|
|
}
|
|
|
|
static void qapi_dealloc_end_list(Visitor *v, void **obj)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_type_str(Visitor *v, const char *name, char **obj,
|
|
Error **errp)
|
|
{
|
|
if (obj) {
|
|
g_free(*obj);
|
|
}
|
|
}
|
|
|
|
static void qapi_dealloc_type_int64(Visitor *v, const char *name, int64_t *obj,
|
|
Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_type_uint64(Visitor *v, const char *name,
|
|
uint64_t *obj, Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_type_bool(Visitor *v, const char *name, bool *obj,
|
|
Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_type_number(Visitor *v, const char *name, double *obj,
|
|
Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_type_anything(Visitor *v, const char *name,
|
|
QObject **obj, Error **errp)
|
|
{
|
|
if (obj) {
|
|
qobject_decref(*obj);
|
|
}
|
|
}
|
|
|
|
static void qapi_dealloc_type_null(Visitor *v, const char *name, Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qapi_dealloc_free(Visitor *v)
|
|
{
|
|
g_free(container_of(v, QapiDeallocVisitor, visitor));
|
|
}
|
|
|
|
Visitor *qapi_dealloc_visitor_new(void)
|
|
{
|
|
QapiDeallocVisitor *v;
|
|
|
|
v = g_malloc0(sizeof(*v));
|
|
|
|
v->visitor.type = VISITOR_DEALLOC;
|
|
v->visitor.start_struct = qapi_dealloc_start_struct;
|
|
v->visitor.end_struct = qapi_dealloc_end_struct;
|
|
v->visitor.start_alternate = qapi_dealloc_start_alternate;
|
|
v->visitor.end_alternate = qapi_dealloc_end_alternate;
|
|
v->visitor.start_list = qapi_dealloc_start_list;
|
|
v->visitor.next_list = qapi_dealloc_next_list;
|
|
v->visitor.end_list = qapi_dealloc_end_list;
|
|
v->visitor.type_int64 = qapi_dealloc_type_int64;
|
|
v->visitor.type_uint64 = qapi_dealloc_type_uint64;
|
|
v->visitor.type_bool = qapi_dealloc_type_bool;
|
|
v->visitor.type_str = qapi_dealloc_type_str;
|
|
v->visitor.type_number = qapi_dealloc_type_number;
|
|
v->visitor.type_any = qapi_dealloc_type_anything;
|
|
v->visitor.type_null = qapi_dealloc_type_null;
|
|
v->visitor.free = qapi_dealloc_free;
|
|
|
|
return &v->visitor;
|
|
}
|