2011-07-19 21:50:35 +02:00
|
|
|
/*
|
|
|
|
* Dealloc Visitor
|
|
|
|
*
|
2016-01-29 14:48:59 +01:00
|
|
|
* Copyright (C) 2012-2016 Red Hat, Inc.
|
2011-07-19 21:50:35 +02:00
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-01-29 18:49:57 +01:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-17 18:19:43 +01:00
|
|
|
#include "qapi/dealloc-visitor.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/queue.h"
|
2011-07-19 21:50:35 +02:00
|
|
|
#include "qemu-common.h"
|
2012-12-17 18:19:43 +01:00
|
|
|
#include "qapi/qmp/types.h"
|
|
|
|
#include "qapi/visitor-impl.h"
|
2011-07-19 21:50:35 +02:00
|
|
|
|
|
|
|
typedef struct StackEntry
|
|
|
|
{
|
|
|
|
void *value;
|
2011-09-20 02:03:10 +02:00
|
|
|
bool is_list_head;
|
2011-07-19 21:50:35 +02:00
|
|
|
QTAILQ_ENTRY(StackEntry) node;
|
|
|
|
} StackEntry;
|
|
|
|
|
|
|
|
struct QapiDeallocVisitor
|
|
|
|
{
|
|
|
|
Visitor visitor;
|
|
|
|
QTAILQ_HEAD(, StackEntry) stack;
|
|
|
|
};
|
|
|
|
|
|
|
|
static QapiDeallocVisitor *to_qov(Visitor *v)
|
|
|
|
{
|
|
|
|
return container_of(v, QapiDeallocVisitor, visitor);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qapi_dealloc_push(QapiDeallocVisitor *qov, void *value)
|
|
|
|
{
|
2011-08-21 05:09:37 +02:00
|
|
|
StackEntry *e = g_malloc0(sizeof(*e));
|
2011-07-19 21:50:35 +02:00
|
|
|
|
|
|
|
e->value = value;
|
2011-09-20 02:03:10 +02:00
|
|
|
|
|
|
|
/* see if we're just pushing a list head tracker */
|
|
|
|
if (value == NULL) {
|
|
|
|
e->is_list_head = true;
|
|
|
|
}
|
2011-07-19 21:50:35 +02:00
|
|
|
QTAILQ_INSERT_HEAD(&qov->stack, e, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *qapi_dealloc_pop(QapiDeallocVisitor *qov)
|
|
|
|
{
|
|
|
|
StackEntry *e = QTAILQ_FIRST(&qov->stack);
|
|
|
|
QObject *value;
|
|
|
|
QTAILQ_REMOVE(&qov->stack, e, node);
|
|
|
|
value = e->value;
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(e);
|
2011-07-19 21:50:35 +02:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_start_struct(Visitor *v, const char *name, void **obj,
|
2016-01-29 14:48:57 +01:00
|
|
|
size_t unused, Error **errp)
|
2011-07-19 21:50:35 +02:00
|
|
|
{
|
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
|
|
|
qapi_dealloc_push(qov, obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qapi_dealloc_end_struct(Visitor *v, Error **errp)
|
|
|
|
{
|
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
|
|
|
void **obj = qapi_dealloc_pop(qov);
|
|
|
|
if (obj) {
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(*obj);
|
2011-07-19 21:50:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-05 19:35:50 +01:00
|
|
|
static void qapi_dealloc_start_implicit_struct(Visitor *v,
|
|
|
|
void **obj,
|
|
|
|
size_t size,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
|
|
|
qapi_dealloc_push(qov, obj);
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:59 +01:00
|
|
|
static void qapi_dealloc_end_implicit_struct(Visitor *v)
|
2013-11-05 19:35:50 +01:00
|
|
|
{
|
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
|
|
|
void **obj = qapi_dealloc_pop(qov);
|
|
|
|
if (obj) {
|
|
|
|
g_free(*obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-19 21:50:35 +02:00
|
|
|
static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)
|
|
|
|
{
|
2011-09-15 21:39:52 +02:00
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
2011-09-20 02:03:10 +02:00
|
|
|
qapi_dealloc_push(qov, NULL);
|
2011-07-19 21:50:35 +02:00
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:59 +01:00
|
|
|
static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp)
|
2011-07-19 21:50:35 +02:00
|
|
|
{
|
2011-09-15 21:39:52 +02:00
|
|
|
GenericList *list = *listp;
|
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
2011-09-20 02:03:10 +02:00
|
|
|
StackEntry *e = QTAILQ_FIRST(&qov->stack);
|
2011-09-15 21:39:52 +02:00
|
|
|
|
2011-09-20 02:03:10 +02:00
|
|
|
if (e && e->is_list_head) {
|
|
|
|
e->is_list_head = false;
|
|
|
|
return list;
|
2011-09-15 21:39:52 +02:00
|
|
|
}
|
|
|
|
|
2011-09-20 02:03:10 +02:00
|
|
|
if (list) {
|
|
|
|
list = list->next;
|
|
|
|
g_free(*listp);
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
2011-07-19 21:50:35 +02:00
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:59 +01:00
|
|
|
static void qapi_dealloc_end_list(Visitor *v)
|
2011-07-19 21:50:35 +02:00
|
|
|
{
|
2011-09-20 02:03:10 +02:00
|
|
|
QapiDeallocVisitor *qov = to_qov(v);
|
|
|
|
void *obj = qapi_dealloc_pop(qov);
|
|
|
|
assert(obj == NULL); /* should've been list head tracker with no payload */
|
2011-07-19 21:50:35 +02:00
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_str(Visitor *v, const char *name, char **obj,
|
2011-07-19 21:50:35 +02:00
|
|
|
Error **errp)
|
|
|
|
{
|
2014-05-08 18:03:15 +02:00
|
|
|
if (obj) {
|
|
|
|
g_free(*obj);
|
|
|
|
}
|
2011-07-19 21:50:35 +02:00
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_int64(Visitor *v, const char *name, int64_t *obj,
|
qapi: Prefer type_int64 over type_int in visitors
The qapi builtin type 'int' is basically shorthand for the type
'int64'. In fact, since no visitor was providing the optional
type_int64() callback, visit_type_int64() was just always falling
back to type_int(), cementing the equivalence between the types.
However, some visitors are providing a type_uint64() callback.
For purposes of code consistency, it is nicer if all visitors
use the paired type_int64/type_uint64 names rather than the
mismatched type_int/type_uint64. So this patch just renames
the signed int callbacks in place, dropping the type_int()
callback as redundant, and a later patch will focus on the
unsigned int callbacks.
Add some FIXMEs to questionable reuse of errp in code touched
by the rename, while at it (the reuse works as long as the
callbacks don't modify value when setting an error, but it's not
a good example to set) - a later patch will then fix those.
No change in functionality here, although further cleanups are
in the pipeline.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-14-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:49 +01:00
|
|
|
Error **errp)
|
2011-07-19 21:50:35 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_uint64(Visitor *v, const char *name,
|
|
|
|
uint64_t *obj, Error **errp)
|
qapi: Make all visitors supply uint64 callbacks
Our qapi visitor contract supports multiple integer visitors,
but left the type_uint64 visitor as optional (falling back on
type_int64); which in turn can lead to awkward behavior with
numbers larger than INT64_MAX (the user has to be aware of
twos complement, and deal with negatives).
This patch does not address the disparity in handling large
values as negatives. It merely moves the fallback from uint64
to int64 from the visitor core to the visitors, where the issue
can actually be fixed, by implementing the missing type_uint64()
callbacks on top of the respective type_int64() callbacks, and
with a FIXME comment explaining why that's wrong.
With that done, we now have a type_uint64() callback in every
driver, so we can make it mandatory from the core. And although
the type_int64() callback can cover the entire valid range of
type_uint{8,16,32} on valid user input, using type_uint64() to
avoid mixed signedness makes more sense.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:50 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_bool(Visitor *v, const char *name, bool *obj,
|
2011-07-19 21:50:35 +02:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_number(Visitor *v, const char *name, double *obj,
|
2011-07-19 21:50:35 +02:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_anything(Visitor *v, const char *name,
|
|
|
|
QObject **obj, Error **errp)
|
2015-09-16 13:06:24 +02:00
|
|
|
{
|
|
|
|
if (obj) {
|
|
|
|
qobject_decref(*obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 14:48:56 +01:00
|
|
|
static void qapi_dealloc_type_enum(Visitor *v, const char *name, int *obj,
|
2016-01-29 14:48:57 +01:00
|
|
|
const char * const strings[], Error **errp)
|
2011-07-19 21:50:35 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-09-18 22:36:41 +02:00
|
|
|
/* If there's no data present, the dealloc visitor has nothing to free.
|
|
|
|
* Thus, indicate to visitor code that the subsequent union fields can
|
|
|
|
* be skipped. This is not an error condition, since the cleanup of the
|
|
|
|
* rest of an object can continue unhindered, so leave errp unset in
|
|
|
|
* these cases.
|
|
|
|
*
|
|
|
|
* NOTE: In cases where we're attempting to deallocate an object that
|
|
|
|
* may have missing fields, the field indicating the union type may
|
|
|
|
* be missing. In such a case, it's possible we don't have enough
|
|
|
|
* information to differentiate data_present == false from a case where
|
|
|
|
* data *is* present but happens to be a scalar with a value of 0.
|
|
|
|
* This is okay, since in the case of the dealloc visitor there's no
|
|
|
|
* work that needs to done in either situation.
|
|
|
|
*
|
|
|
|
* The current inability in QAPI code to more thoroughly verify a union
|
|
|
|
* type in such cases will likely need to be addressed if we wish to
|
|
|
|
* implement this interface for other types of visitors in the future,
|
|
|
|
* however.
|
|
|
|
*/
|
|
|
|
static bool qapi_dealloc_start_union(Visitor *v, bool data_present,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
return data_present;
|
|
|
|
}
|
|
|
|
|
2011-07-19 21:50:35 +02:00
|
|
|
Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v)
|
|
|
|
{
|
|
|
|
return &v->visitor;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qapi_dealloc_visitor_cleanup(QapiDeallocVisitor *v)
|
|
|
|
{
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(v);
|
2011-07-19 21:50:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
QapiDeallocVisitor *qapi_dealloc_visitor_new(void)
|
|
|
|
{
|
|
|
|
QapiDeallocVisitor *v;
|
|
|
|
|
2011-08-21 05:09:37 +02:00
|
|
|
v = g_malloc0(sizeof(*v));
|
2011-07-19 21:50:35 +02:00
|
|
|
|
|
|
|
v->visitor.start_struct = qapi_dealloc_start_struct;
|
|
|
|
v->visitor.end_struct = qapi_dealloc_end_struct;
|
2013-11-05 19:35:50 +01:00
|
|
|
v->visitor.start_implicit_struct = qapi_dealloc_start_implicit_struct;
|
|
|
|
v->visitor.end_implicit_struct = qapi_dealloc_end_implicit_struct;
|
2011-07-19 21:50:35 +02:00
|
|
|
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_enum = qapi_dealloc_type_enum;
|
qapi: Prefer type_int64 over type_int in visitors
The qapi builtin type 'int' is basically shorthand for the type
'int64'. In fact, since no visitor was providing the optional
type_int64() callback, visit_type_int64() was just always falling
back to type_int(), cementing the equivalence between the types.
However, some visitors are providing a type_uint64() callback.
For purposes of code consistency, it is nicer if all visitors
use the paired type_int64/type_uint64 names rather than the
mismatched type_int/type_uint64. So this patch just renames
the signed int callbacks in place, dropping the type_int()
callback as redundant, and a later patch will focus on the
unsigned int callbacks.
Add some FIXMEs to questionable reuse of errp in code touched
by the rename, while at it (the reuse works as long as the
callbacks don't modify value when setting an error, but it's not
a good example to set) - a later patch will then fix those.
No change in functionality here, although further cleanups are
in the pipeline.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-14-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:49 +01:00
|
|
|
v->visitor.type_int64 = qapi_dealloc_type_int64;
|
qapi: Make all visitors supply uint64 callbacks
Our qapi visitor contract supports multiple integer visitors,
but left the type_uint64 visitor as optional (falling back on
type_int64); which in turn can lead to awkward behavior with
numbers larger than INT64_MAX (the user has to be aware of
twos complement, and deal with negatives).
This patch does not address the disparity in handling large
values as negatives. It merely moves the fallback from uint64
to int64 from the visitor core to the visitors, where the issue
can actually be fixed, by implementing the missing type_uint64()
callbacks on top of the respective type_int64() callbacks, and
with a FIXME comment explaining why that's wrong.
With that done, we now have a type_uint64() callback in every
driver, so we can make it mandatory from the core. And although
the type_int64() callback can cover the entire valid range of
type_uint{8,16,32} on valid user input, using type_uint64() to
avoid mixed signedness makes more sense.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:50 +01:00
|
|
|
v->visitor.type_uint64 = qapi_dealloc_type_uint64;
|
2011-07-19 21:50:35 +02:00
|
|
|
v->visitor.type_bool = qapi_dealloc_type_bool;
|
|
|
|
v->visitor.type_str = qapi_dealloc_type_str;
|
|
|
|
v->visitor.type_number = qapi_dealloc_type_number;
|
2015-09-16 13:06:24 +02:00
|
|
|
v->visitor.type_any = qapi_dealloc_type_anything;
|
2014-09-18 22:36:41 +02:00
|
|
|
v->visitor.start_union = qapi_dealloc_start_union;
|
2011-07-19 21:50:35 +02:00
|
|
|
|
|
|
|
QTAILQ_INIT(&v->stack);
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|