15280c360e
The macro expansions of qdict_put_TYPE() and qlist_append_TYPE() need qbool.h, qnull.h, qnum.h and qstring.h to compile. We include qnull.h and qnum.h in the headers, but not qbool.h and qstring.h. Works, because we include those wherever the macros get used. Open-coding these helpers is of dubious value. Turn them into functions and drop the includes from the headers. This cleanup makes the number of objects depending on qapi/qmp/qnum.h from 4551 (out of 4743) to 46 in my "build everything" tree. For qapi/qmp/qnull.h, the number drops from 4552 to 21. Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180201111846.21846-10-armbru@redhat.com>
144 lines
3.6 KiB
C
144 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 "qapi/qmp/qnull.h"
|
|
#include "qemu/queue.h"
|
|
#include "qemu-common.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,
|
|
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,
|
|
QNull **obj, Error **errp)
|
|
{
|
|
if (obj) {
|
|
QDECREF(*obj);
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|