2011-07-19 19:50:34 +00:00
|
|
|
/*
|
|
|
|
* Core Definitions for QAPI/QMP Command Registry
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-01-29 17:49:57 +00:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-17 17:19:43 +00:00
|
|
|
#include "qapi/qmp-output-visitor.h"
|
|
|
|
#include "qapi/visitor-impl.h"
|
2012-12-17 17:20:00 +00:00
|
|
|
#include "qemu/queue.h"
|
2011-07-19 19:50:34 +00:00
|
|
|
#include "qemu-common.h"
|
2012-12-17 17:19:43 +00:00
|
|
|
#include "qapi/qmp/types.h"
|
2011-07-19 19:50:34 +00:00
|
|
|
|
|
|
|
typedef struct QStackEntry
|
|
|
|
{
|
|
|
|
QObject *value;
|
2011-09-20 00:03:11 +00:00
|
|
|
bool is_list_head;
|
2011-07-19 19:50:34 +00:00
|
|
|
QTAILQ_ENTRY(QStackEntry) node;
|
|
|
|
} QStackEntry;
|
|
|
|
|
|
|
|
typedef QTAILQ_HEAD(QStack, QStackEntry) QStack;
|
|
|
|
|
|
|
|
struct QmpOutputVisitor
|
|
|
|
{
|
|
|
|
Visitor visitor;
|
|
|
|
QStack stack;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define qmp_output_add(qov, name, value) \
|
|
|
|
qmp_output_add_obj(qov, name, QOBJECT(value))
|
|
|
|
#define qmp_output_push(qov, value) qmp_output_push_obj(qov, QOBJECT(value))
|
|
|
|
|
|
|
|
static QmpOutputVisitor *to_qov(Visitor *v)
|
|
|
|
{
|
|
|
|
return container_of(v, QmpOutputVisitor, visitor);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value)
|
|
|
|
{
|
2011-08-21 03:09:37 +00:00
|
|
|
QStackEntry *e = g_malloc0(sizeof(*e));
|
2011-07-19 19:50:34 +00:00
|
|
|
|
|
|
|
e->value = value;
|
2011-09-20 00:03:11 +00:00
|
|
|
if (qobject_type(e->value) == QTYPE_QLIST) {
|
|
|
|
e->is_list_head = true;
|
|
|
|
}
|
2011-07-19 19:50:34 +00:00
|
|
|
QTAILQ_INSERT_HEAD(&qov->stack, e, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
static QObject *qmp_output_pop(QmpOutputVisitor *qov)
|
|
|
|
{
|
|
|
|
QStackEntry *e = QTAILQ_FIRST(&qov->stack);
|
|
|
|
QObject *value;
|
|
|
|
QTAILQ_REMOVE(&qov->stack, e, node);
|
|
|
|
value = e->value;
|
2011-08-21 03:09:37 +00:00
|
|
|
g_free(e);
|
2011-07-19 19:50:34 +00:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static QObject *qmp_output_first(QmpOutputVisitor *qov)
|
|
|
|
{
|
|
|
|
QStackEntry *e = QTAILQ_LAST(&qov->stack, QStack);
|
2014-05-26 12:40:55 +00:00
|
|
|
|
qapi: Make output visitor return qnull() instead of NULL
Before commit 1d10b44, it crashed. Since then, it returns NULL, with
a FIXME comment. The FIXME is valid: code that assumes QObject *
can't be null exists. I'm not aware of a way to feed this problematic
return value to code that actually chokes on null in the current code,
but the next few commits will create one, failing "make check".
Commit 481b002 solved a very similar problem by introducing a special
null QObject. Using this special null QObject is clearly the right
way to resolve this FIXME, so do that, and update the test
accordingly.
However, the patch isn't quite right: it messes up the reference
counting. After about SIZE_MAX visits, the reference counter
overflows, failing the assertion in qnull_destroy_obj(). Because
that's many orders of magnitude more visits of nulls than we expect,
we take this patch despite its flaws, to get the QMP introspection
stuff in without further delay. We'll want to fix it for real before
the release.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-21-git-send-email-armbru@redhat.com>
2015-09-16 11:06:23 +00:00
|
|
|
/*
|
|
|
|
* FIXME Wrong, because qmp_output_get_qobject() will increment
|
|
|
|
* the refcnt *again*. We need to think through how visitors
|
|
|
|
* handle null.
|
|
|
|
*/
|
2014-05-26 12:40:55 +00:00
|
|
|
if (!e) {
|
qapi: Make output visitor return qnull() instead of NULL
Before commit 1d10b44, it crashed. Since then, it returns NULL, with
a FIXME comment. The FIXME is valid: code that assumes QObject *
can't be null exists. I'm not aware of a way to feed this problematic
return value to code that actually chokes on null in the current code,
but the next few commits will create one, failing "make check".
Commit 481b002 solved a very similar problem by introducing a special
null QObject. Using this special null QObject is clearly the right
way to resolve this FIXME, so do that, and update the test
accordingly.
However, the patch isn't quite right: it messes up the reference
counting. After about SIZE_MAX visits, the reference counter
overflows, failing the assertion in qnull_destroy_obj(). Because
that's many orders of magnitude more visits of nulls than we expect,
we take this patch despite its flaws, to get the QMP introspection
stuff in without further delay. We'll want to fix it for real before
the release.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-21-git-send-email-armbru@redhat.com>
2015-09-16 11:06:23 +00:00
|
|
|
return qnull();
|
2014-05-26 12:40:55 +00:00
|
|
|
}
|
|
|
|
|
2011-07-19 19:50:34 +00:00
|
|
|
return e->value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static QObject *qmp_output_last(QmpOutputVisitor *qov)
|
|
|
|
{
|
|
|
|
QStackEntry *e = QTAILQ_FIRST(&qov->stack);
|
|
|
|
return e->value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name,
|
|
|
|
QObject *value)
|
|
|
|
{
|
|
|
|
QObject *cur;
|
|
|
|
|
|
|
|
if (QTAILQ_EMPTY(&qov->stack)) {
|
|
|
|
qmp_output_push_obj(qov, value);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cur = qmp_output_last(qov);
|
|
|
|
|
|
|
|
switch (qobject_type(cur)) {
|
|
|
|
case QTYPE_QDICT:
|
|
|
|
qdict_put_obj(qobject_to_qdict(cur), name, value);
|
|
|
|
break;
|
|
|
|
case QTYPE_QLIST:
|
|
|
|
qlist_append_obj(qobject_to_qlist(cur), value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
qobject_decref(qmp_output_pop(qov));
|
|
|
|
qmp_output_push_obj(qov, value);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_start_struct(Visitor *v, const char *name, void **obj,
|
|
|
|
const char *kind, size_t unused,
|
2011-07-19 19:50:34 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
QDict *dict = qdict_new();
|
|
|
|
|
|
|
|
qmp_output_add(qov, name, dict);
|
|
|
|
qmp_output_push(qov, dict);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qmp_output_end_struct(Visitor *v, Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_pop(qov);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qmp_output_start_list(Visitor *v, const char *name, Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
QList *list = qlist_new();
|
|
|
|
|
|
|
|
qmp_output_add(qov, name, list);
|
|
|
|
qmp_output_push(qov, list);
|
|
|
|
}
|
|
|
|
|
2011-09-20 00:03:11 +00:00
|
|
|
static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp,
|
2011-07-19 19:50:34 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
2011-09-20 00:03:11 +00:00
|
|
|
GenericList *list = *listp;
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
QStackEntry *e = QTAILQ_FIRST(&qov->stack);
|
|
|
|
|
|
|
|
assert(e);
|
|
|
|
if (e->is_list_head) {
|
|
|
|
e->is_list_head = false;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list ? list->next : NULL;
|
2011-07-19 19:50:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void qmp_output_end_list(Visitor *v, Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_pop(qov);
|
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_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 13:48:49 +00:00
|
|
|
Error **errp)
|
2011-07-19 19:50:34 +00:00
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_add(qov, name, qint_from_int(*obj));
|
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_type_uint64(Visitor *v, const char *name, uint64_t *obj,
|
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 13:48:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
/* FIXME: QMP outputs values larger than INT64_MAX as negative */
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_add(qov, name, qint_from_int(*obj));
|
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_type_bool(Visitor *v, const char *name, bool *obj,
|
2011-07-19 19:50:34 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
2015-05-15 22:24:59 +00:00
|
|
|
qmp_output_add(qov, name, qbool_from_bool(*obj));
|
2011-07-19 19:50:34 +00:00
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_type_str(Visitor *v, const char *name, char **obj,
|
2011-07-19 19:50:34 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
if (*obj) {
|
|
|
|
qmp_output_add(qov, name, qstring_from_str(*obj));
|
|
|
|
} else {
|
|
|
|
qmp_output_add(qov, name, qstring_from_str(""));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_type_number(Visitor *v, const char *name, double *obj,
|
2011-07-19 19:50:34 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_add(qov, name, qfloat_from_double(*obj));
|
|
|
|
}
|
|
|
|
|
2016-01-29 13:48:56 +00:00
|
|
|
static void qmp_output_type_any(Visitor *v, const char *name, QObject **obj,
|
2015-09-16 11:06:24 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qobject_incref(*obj);
|
|
|
|
qmp_output_add_obj(qov, name, *obj);
|
|
|
|
}
|
|
|
|
|
2011-07-19 19:50:34 +00:00
|
|
|
QObject *qmp_output_get_qobject(QmpOutputVisitor *qov)
|
|
|
|
{
|
|
|
|
QObject *obj = qmp_output_first(qov);
|
|
|
|
if (obj) {
|
|
|
|
qobject_incref(obj);
|
|
|
|
}
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
Visitor *qmp_output_get_visitor(QmpOutputVisitor *v)
|
|
|
|
{
|
|
|
|
return &v->visitor;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qmp_output_visitor_cleanup(QmpOutputVisitor *v)
|
|
|
|
{
|
|
|
|
QStackEntry *e, *tmp;
|
|
|
|
|
2012-03-20 10:22:48 +00:00
|
|
|
/* The bottom QStackEntry, if any, owns the root QObject. See the
|
|
|
|
* qmp_output_push_obj() invocations in qmp_output_add_obj(). */
|
|
|
|
QObject *root = QTAILQ_EMPTY(&v->stack) ? NULL : qmp_output_first(v);
|
|
|
|
|
2011-07-19 19:50:34 +00:00
|
|
|
QTAILQ_FOREACH_SAFE(e, &v->stack, node, tmp) {
|
|
|
|
QTAILQ_REMOVE(&v->stack, e, node);
|
2011-08-21 03:09:37 +00:00
|
|
|
g_free(e);
|
2011-07-19 19:50:34 +00:00
|
|
|
}
|
|
|
|
|
2012-03-20 10:22:48 +00:00
|
|
|
qobject_decref(root);
|
2011-08-21 03:09:37 +00:00
|
|
|
g_free(v);
|
2011-07-19 19:50:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
QmpOutputVisitor *qmp_output_visitor_new(void)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *v;
|
|
|
|
|
2011-08-21 03:09:37 +00:00
|
|
|
v = g_malloc0(sizeof(*v));
|
2011-07-19 19:50:34 +00:00
|
|
|
|
|
|
|
v->visitor.start_struct = qmp_output_start_struct;
|
|
|
|
v->visitor.end_struct = qmp_output_end_struct;
|
|
|
|
v->visitor.start_list = qmp_output_start_list;
|
|
|
|
v->visitor.next_list = qmp_output_next_list;
|
|
|
|
v->visitor.end_list = qmp_output_end_list;
|
2012-02-09 08:11:52 +00:00
|
|
|
v->visitor.type_enum = output_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 13:48:49 +00:00
|
|
|
v->visitor.type_int64 = qmp_output_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 13:48:50 +00:00
|
|
|
v->visitor.type_uint64 = qmp_output_type_uint64;
|
2011-07-19 19:50:34 +00:00
|
|
|
v->visitor.type_bool = qmp_output_type_bool;
|
|
|
|
v->visitor.type_str = qmp_output_type_str;
|
|
|
|
v->visitor.type_number = qmp_output_type_number;
|
2015-09-16 11:06:24 +00:00
|
|
|
v->visitor.type_any = qmp_output_type_any;
|
2011-07-19 19:50:34 +00:00
|
|
|
|
|
|
|
QTAILQ_INIT(&v->stack);
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|