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>
368 lines
9.2 KiB
C
368 lines
9.2 KiB
C
/*
|
|
* Input Visitor
|
|
*
|
|
* Copyright IBM, Corp. 2011
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.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/qmp-input-visitor.h"
|
|
#include "qapi/visitor-impl.h"
|
|
#include "qemu/queue.h"
|
|
#include "qemu-common.h"
|
|
#include "qapi/qmp/types.h"
|
|
#include "qapi/qmp/qerror.h"
|
|
|
|
#define QIV_STACK_SIZE 1024
|
|
|
|
typedef struct StackObject
|
|
{
|
|
QObject *obj;
|
|
const QListEntry *entry;
|
|
GHashTable *h;
|
|
} StackObject;
|
|
|
|
struct QmpInputVisitor
|
|
{
|
|
Visitor visitor;
|
|
StackObject stack[QIV_STACK_SIZE];
|
|
int nb_stack;
|
|
bool strict;
|
|
};
|
|
|
|
static QmpInputVisitor *to_qiv(Visitor *v)
|
|
{
|
|
return container_of(v, QmpInputVisitor, visitor);
|
|
}
|
|
|
|
static QObject *qmp_input_get_object(QmpInputVisitor *qiv,
|
|
const char *name,
|
|
bool consume)
|
|
{
|
|
QObject *qobj = qiv->stack[qiv->nb_stack - 1].obj;
|
|
|
|
if (qobj) {
|
|
if (name && qobject_type(qobj) == QTYPE_QDICT) {
|
|
if (qiv->stack[qiv->nb_stack - 1].h && consume) {
|
|
g_hash_table_remove(qiv->stack[qiv->nb_stack - 1].h, name);
|
|
}
|
|
return qdict_get(qobject_to_qdict(qobj), name);
|
|
} else if (qiv->stack[qiv->nb_stack - 1].entry) {
|
|
return qlist_entry_obj(qiv->stack[qiv->nb_stack - 1].entry);
|
|
}
|
|
}
|
|
|
|
return qobj;
|
|
}
|
|
|
|
static void qdict_add_key(const char *key, QObject *obj, void *opaque)
|
|
{
|
|
GHashTable *h = opaque;
|
|
g_hash_table_insert(h, (gpointer) key, NULL);
|
|
}
|
|
|
|
static void qmp_input_push(QmpInputVisitor *qiv, QObject *obj, Error **errp)
|
|
{
|
|
GHashTable *h;
|
|
|
|
if (qiv->nb_stack >= QIV_STACK_SIZE) {
|
|
error_setg(errp, "An internal buffer overran");
|
|
return;
|
|
}
|
|
|
|
qiv->stack[qiv->nb_stack].obj = obj;
|
|
qiv->stack[qiv->nb_stack].entry = NULL;
|
|
qiv->stack[qiv->nb_stack].h = NULL;
|
|
|
|
if (qiv->strict && qobject_type(obj) == QTYPE_QDICT) {
|
|
h = g_hash_table_new(g_str_hash, g_str_equal);
|
|
qdict_iter(qobject_to_qdict(obj), qdict_add_key, h);
|
|
qiv->stack[qiv->nb_stack].h = h;
|
|
}
|
|
|
|
qiv->nb_stack++;
|
|
}
|
|
|
|
/** Only for qmp_input_pop. */
|
|
static gboolean always_true(gpointer key, gpointer val, gpointer user_pkey)
|
|
{
|
|
*(const char **)user_pkey = (const char *)key;
|
|
return TRUE;
|
|
}
|
|
|
|
static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp)
|
|
{
|
|
assert(qiv->nb_stack > 0);
|
|
|
|
if (qiv->strict) {
|
|
GHashTable * const top_ht = qiv->stack[qiv->nb_stack - 1].h;
|
|
if (top_ht) {
|
|
if (g_hash_table_size(top_ht)) {
|
|
const char *key;
|
|
g_hash_table_find(top_ht, always_true, &key);
|
|
error_setg(errp, QERR_QMP_EXTRA_MEMBER, key);
|
|
}
|
|
g_hash_table_unref(top_ht);
|
|
}
|
|
}
|
|
|
|
qiv->nb_stack--;
|
|
}
|
|
|
|
static void qmp_input_start_struct(Visitor *v, void **obj, const char *kind,
|
|
const char *name, size_t size, Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
Error *err = NULL;
|
|
|
|
if (!qobj || qobject_type(qobj) != QTYPE_QDICT) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
"QDict");
|
|
return;
|
|
}
|
|
|
|
qmp_input_push(qiv, qobj, &err);
|
|
if (err) {
|
|
error_propagate(errp, err);
|
|
return;
|
|
}
|
|
|
|
if (obj) {
|
|
*obj = g_malloc0(size);
|
|
}
|
|
}
|
|
|
|
static void qmp_input_end_struct(Visitor *v, Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
qmp_input_pop(qiv, errp);
|
|
}
|
|
|
|
static void qmp_input_start_implicit_struct(Visitor *v, void **obj,
|
|
size_t size, Error **errp)
|
|
{
|
|
if (obj) {
|
|
*obj = g_malloc0(size);
|
|
}
|
|
}
|
|
|
|
static void qmp_input_end_implicit_struct(Visitor *v, Error **errp)
|
|
{
|
|
}
|
|
|
|
static void qmp_input_start_list(Visitor *v, const char *name, Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
|
|
if (!qobj || qobject_type(qobj) != QTYPE_QLIST) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
"list");
|
|
return;
|
|
}
|
|
|
|
qmp_input_push(qiv, qobj, errp);
|
|
}
|
|
|
|
static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
|
|
Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
GenericList *entry;
|
|
StackObject *so = &qiv->stack[qiv->nb_stack - 1];
|
|
bool first;
|
|
|
|
if (so->entry == NULL) {
|
|
so->entry = qlist_first(qobject_to_qlist(so->obj));
|
|
first = true;
|
|
} else {
|
|
so->entry = qlist_next(so->entry);
|
|
first = false;
|
|
}
|
|
|
|
if (so->entry == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
entry = g_malloc0(sizeof(*entry));
|
|
if (first) {
|
|
*list = entry;
|
|
} else {
|
|
(*list)->next = entry;
|
|
}
|
|
|
|
return entry;
|
|
}
|
|
|
|
static void qmp_input_end_list(Visitor *v, Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
qmp_input_pop(qiv, errp);
|
|
}
|
|
|
|
static void qmp_input_get_next_type(Visitor *v, QType *type, bool promote_int,
|
|
const char *name, Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QObject *qobj = qmp_input_get_object(qiv, name, false);
|
|
|
|
if (!qobj) {
|
|
error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
|
|
return;
|
|
}
|
|
*type = qobject_type(qobj);
|
|
if (promote_int && *type == QTYPE_QINT) {
|
|
*type = QTYPE_QFLOAT;
|
|
}
|
|
}
|
|
|
|
static void qmp_input_type_int64(Visitor *v, int64_t *obj, const char *name,
|
|
Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
|
|
|
|
if (!qint) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
"integer");
|
|
return;
|
|
}
|
|
|
|
*obj = qint_get_int(qint);
|
|
}
|
|
|
|
static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name,
|
|
Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true));
|
|
|
|
if (!qbool) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
"boolean");
|
|
return;
|
|
}
|
|
|
|
*obj = qbool_get_bool(qbool);
|
|
}
|
|
|
|
static void qmp_input_type_str(Visitor *v, char **obj, const char *name,
|
|
Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
|
|
|
|
if (!qstr) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
"string");
|
|
return;
|
|
}
|
|
|
|
*obj = g_strdup(qstring_get_str(qstr));
|
|
}
|
|
|
|
static void qmp_input_type_number(Visitor *v, double *obj, const char *name,
|
|
Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
QInt *qint;
|
|
QFloat *qfloat;
|
|
|
|
qint = qobject_to_qint(qobj);
|
|
if (qint) {
|
|
*obj = qint_get_int(qobject_to_qint(qobj));
|
|
return;
|
|
}
|
|
|
|
qfloat = qobject_to_qfloat(qobj);
|
|
if (qfloat) {
|
|
*obj = qfloat_get_double(qobject_to_qfloat(qobj));
|
|
return;
|
|
}
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
"number");
|
|
}
|
|
|
|
static void qmp_input_type_any(Visitor *v, QObject **obj, const char *name,
|
|
Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
|
|
qobject_incref(qobj);
|
|
*obj = qobj;
|
|
}
|
|
|
|
static void qmp_input_optional(Visitor *v, bool *present, const char *name)
|
|
{
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
|
|
if (!qobj) {
|
|
*present = false;
|
|
return;
|
|
}
|
|
|
|
*present = true;
|
|
}
|
|
|
|
Visitor *qmp_input_get_visitor(QmpInputVisitor *v)
|
|
{
|
|
return &v->visitor;
|
|
}
|
|
|
|
void qmp_input_visitor_cleanup(QmpInputVisitor *v)
|
|
{
|
|
qobject_decref(v->stack[0].obj);
|
|
g_free(v);
|
|
}
|
|
|
|
QmpInputVisitor *qmp_input_visitor_new(QObject *obj)
|
|
{
|
|
QmpInputVisitor *v;
|
|
|
|
v = g_malloc0(sizeof(*v));
|
|
|
|
v->visitor.start_struct = qmp_input_start_struct;
|
|
v->visitor.end_struct = qmp_input_end_struct;
|
|
v->visitor.start_implicit_struct = qmp_input_start_implicit_struct;
|
|
v->visitor.end_implicit_struct = qmp_input_end_implicit_struct;
|
|
v->visitor.start_list = qmp_input_start_list;
|
|
v->visitor.next_list = qmp_input_next_list;
|
|
v->visitor.end_list = qmp_input_end_list;
|
|
v->visitor.type_enum = input_type_enum;
|
|
v->visitor.type_int64 = qmp_input_type_int64;
|
|
v->visitor.type_bool = qmp_input_type_bool;
|
|
v->visitor.type_str = qmp_input_type_str;
|
|
v->visitor.type_number = qmp_input_type_number;
|
|
v->visitor.type_any = qmp_input_type_any;
|
|
v->visitor.optional = qmp_input_optional;
|
|
v->visitor.get_next_type = qmp_input_get_next_type;
|
|
|
|
qmp_input_push(v, obj, NULL);
|
|
qobject_incref(obj);
|
|
|
|
return v;
|
|
}
|
|
|
|
QmpInputVisitor *qmp_input_visitor_new_strict(QObject *obj)
|
|
{
|
|
QmpInputVisitor *v;
|
|
|
|
v = qmp_input_visitor_new(obj);
|
|
v->strict = true;
|
|
|
|
return v;
|
|
}
|