2011-07-19 23:50:34 +04:00
|
|
|
/*
|
|
|
|
* Core Definitions for QAPI/QMP Command Registry
|
|
|
|
*
|
2016-01-29 16:48:59 +03:00
|
|
|
* Copyright (C) 2012-2016 Red Hat, Inc.
|
2011-07-19 23:50:34 +04:00
|
|
|
* 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 20:49:57 +03:00
|
|
|
#include "qemu/osdep.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp-output-visitor.h"
|
|
|
|
#include "qapi/visitor-impl.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/queue.h"
|
2011-07-19 23:50:34 +04:00
|
|
|
#include "qemu-common.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/types.h"
|
2011-07-19 23:50:34 +04:00
|
|
|
|
|
|
|
typedef struct QStackEntry
|
|
|
|
{
|
|
|
|
QObject *value;
|
|
|
|
QTAILQ_ENTRY(QStackEntry) node;
|
|
|
|
} QStackEntry;
|
|
|
|
|
|
|
|
typedef QTAILQ_HEAD(QStack, QStackEntry) QStack;
|
|
|
|
|
|
|
|
struct QmpOutputVisitor
|
|
|
|
{
|
|
|
|
Visitor visitor;
|
2016-01-29 16:49:01 +03:00
|
|
|
QStack stack; /* Stack of containers that haven't yet been finished */
|
|
|
|
QObject *root; /* Root of the output visit */
|
2011-07-19 23:50:34 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
#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);
|
|
|
|
}
|
|
|
|
|
2016-01-29 16:49:00 +03:00
|
|
|
/* Push @value onto the stack of current QObjects being built */
|
2011-07-19 23:50:34 +04:00
|
|
|
static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value)
|
|
|
|
{
|
2011-08-21 07:09:37 +04:00
|
|
|
QStackEntry *e = g_malloc0(sizeof(*e));
|
2011-07-19 23:50:34 +04:00
|
|
|
|
2016-01-29 16:49:01 +03:00
|
|
|
assert(qov->root);
|
2016-01-29 16:49:00 +03:00
|
|
|
assert(value);
|
2011-07-19 23:50:34 +04:00
|
|
|
e->value = value;
|
|
|
|
QTAILQ_INSERT_HEAD(&qov->stack, e, node);
|
|
|
|
}
|
|
|
|
|
2016-01-29 16:49:00 +03:00
|
|
|
/* Pop a value off the stack of QObjects being built, and return it. */
|
2011-07-19 23:50:34 +04:00
|
|
|
static QObject *qmp_output_pop(QmpOutputVisitor *qov)
|
|
|
|
{
|
|
|
|
QStackEntry *e = QTAILQ_FIRST(&qov->stack);
|
|
|
|
QObject *value;
|
2016-01-29 16:49:00 +03:00
|
|
|
|
|
|
|
assert(e);
|
2011-07-19 23:50:34 +04:00
|
|
|
QTAILQ_REMOVE(&qov->stack, e, node);
|
|
|
|
value = e->value;
|
2016-01-29 16:49:00 +03:00
|
|
|
assert(value);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(e);
|
2011-07-19 23:50:34 +04:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2016-01-29 16:49:00 +03:00
|
|
|
/* Add @value to the current QObject being built.
|
|
|
|
* If the stack is visiting a dictionary or list, @value is now owned
|
|
|
|
* by that container. Otherwise, @value is now the root. */
|
2011-07-19 23:50:34 +04:00
|
|
|
static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name,
|
|
|
|
QObject *value)
|
|
|
|
{
|
2016-01-29 16:49:01 +03:00
|
|
|
QStackEntry *e = QTAILQ_FIRST(&qov->stack);
|
|
|
|
QObject *cur = e ? e->value : NULL;
|
2011-07-19 23:50:34 +04:00
|
|
|
|
2016-01-29 16:49:01 +03:00
|
|
|
if (!cur) {
|
2016-04-29 00:45:26 +03:00
|
|
|
/* Don't allow reuse of visitor on more than one root */
|
|
|
|
assert(!qov->root);
|
2016-01-29 16:49:01 +03:00
|
|
|
qov->root = value;
|
|
|
|
} else {
|
|
|
|
switch (qobject_type(cur)) {
|
|
|
|
case QTYPE_QDICT:
|
|
|
|
assert(name);
|
|
|
|
qdict_put_obj(qobject_to_qdict(cur), name, value);
|
|
|
|
break;
|
|
|
|
case QTYPE_QLIST:
|
2016-04-29 00:45:26 +03:00
|
|
|
assert(!name);
|
2016-01-29 16:49:01 +03:00
|
|
|
qlist_append_obj(qobject_to_qlist(cur), value);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-29 16:48:56 +03:00
|
|
|
static void qmp_output_start_struct(Visitor *v, const char *name, void **obj,
|
2016-01-29 16:48:57 +03:00
|
|
|
size_t unused, Error **errp)
|
2011-07-19 23:50:34 +04:00
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
QDict *dict = qdict_new();
|
|
|
|
|
|
|
|
qmp_output_add(qov, name, dict);
|
|
|
|
qmp_output_push(qov, dict);
|
|
|
|
}
|
|
|
|
|
qapi: Split visit_end_struct() into pieces
As mentioned in previous patches, we want to call visit_end_struct()
functions unconditionally, so that visitors can release resources
tied up since the matching visit_start_struct() without also having
to worry about error priority if more than one error occurs.
Even though error_propagate() can be safely used to ignore a second
error during cleanup caused by a first error, it is simpler if the
cleanup cannot set an error. So, split out the error checking
portion (basically, input visitors checking for unvisited keys) into
a new function visit_check_struct(), which can be safely skipped if
any earlier errors are encountered, and leave the cleanup portion
(which never fails, but must be called unconditionally if
visit_start_struct() succeeded) in visit_end_struct().
Generated code in qapi-visit.c has diffs resembling:
|@@ -59,10 +59,12 @@ void visit_type_ACPIOSTInfo(Visitor *v,
| goto out_obj;
| }
| visit_type_ACPIOSTInfo_members(v, obj, &err);
|- error_propagate(errp, err);
|- err = NULL;
|+ if (err) {
|+ goto out_obj;
|+ }
|+ visit_check_struct(v, &err);
| out_obj:
|- visit_end_struct(v, &err);
|+ visit_end_struct(v);
| out:
and in qapi-event.c:
@@ -47,7 +47,10 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
| visit_type_q_obj_ACPI_DEVICE_OST_arg_members(v, ¶m, &err);
|- visit_end_struct(v, err ? NULL : &err);
|+ if (!err) {
|+ visit_check_struct(v, &err);
|+ }
|+ visit_end_struct(v);
| if (err) {
| goto out;
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-20-git-send-email-eblake@redhat.com>
[Conflict with a doc fixup resolved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:27 +03:00
|
|
|
static void qmp_output_end_struct(Visitor *v)
|
2011-07-19 23:50:34 +04:00
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
2016-04-29 00:45:26 +03:00
|
|
|
QObject *value = qmp_output_pop(qov);
|
|
|
|
assert(qobject_type(value) == QTYPE_QDICT);
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
qapi: Simplify semantics of visit_next_list()
The semantics of the list visit are somewhat baroque, with the
following pseudocode when FooList is used:
start()
for (prev = head; cur = next(prev); prev = &cur) {
visit(&cur->value)
}
Note that these semantics (advance before visit) requires that
the first call to next() return the list head, while all other
calls return the next element of the list; that is, every visitor
implementation is required to track extra state to decide whether
to return the input as-is, or to advance. It also requires an
argument of 'GenericList **' to next(), solely because the first
iteration might need to modify the caller's GenericList head, so
that all other calls have to do a layer of dereferencing.
Thankfully, we only have two uses of list visits in the entire
code base: one in spapr_drc (which completely avoids
visit_next_list(), feeding in integers from a different source
than uint8List), and one in qapi-visit.py. That is, all other
list visitors are generated in qapi-visit.c, and share the same
paradigm based on a qapi FooList type, so we can refactor how
lists are laid out with minimal churn among clients.
We can greatly simplify things by hoisting the special case
into the start() routine, and flipping the order in the loop
to visit before advance:
start(head)
for (tail = *head; tail; tail = next(tail)) {
visit(&tail->value)
}
With the simpler semantics, visitors have less state to track,
the argument to next() is reduced to 'GenericList *', and it
also becomes obvious whether an input visitor is allocating a
FooList during visit_start_list() (rather than the old way of
not knowing if an allocation happened until the first
visit_next_list()). As a minor drawback, we now allocate in
two functions instead of one, and have to pass the size to
both functions (unless we were to tweak the input visitors to
cache the size to start_list for reuse during next_list, but
that defeats the goal of less visitor state).
The signature of visit_start_list() is chosen to match
visit_start_struct(), with the new parameters after 'name'.
The spapr_drc case is a virtual visit, done by passing NULL for
list, similarly to how NULL is passed to visit_start_struct()
when a qapi type is not used in those visits. It was easy to
provide these semantics for qmp-output and dealloc visitors,
and a bit harder for qmp-input (several prerequisite patches
refactored things to make this patch straightforward). But it
turned out that the string and opts visitors munge enough other
state during visit_next_list() to make it easier to just
document and require a GenericList visit for now; an assertion
will remind us to adjust things if we need the semantics in the
future.
Several pre-requisite cleanup patches made the reshuffling of
the various visitors easier; particularly the qmp input visitor.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-24-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:31 +03:00
|
|
|
static void qmp_output_start_list(Visitor *v, const char *name,
|
|
|
|
GenericList **listp, size_t size,
|
|
|
|
Error **errp)
|
2011-07-19 23:50:34 +04:00
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
QList *list = qlist_new();
|
|
|
|
|
|
|
|
qmp_output_add(qov, name, list);
|
|
|
|
qmp_output_push(qov, list);
|
|
|
|
}
|
|
|
|
|
qapi: Simplify semantics of visit_next_list()
The semantics of the list visit are somewhat baroque, with the
following pseudocode when FooList is used:
start()
for (prev = head; cur = next(prev); prev = &cur) {
visit(&cur->value)
}
Note that these semantics (advance before visit) requires that
the first call to next() return the list head, while all other
calls return the next element of the list; that is, every visitor
implementation is required to track extra state to decide whether
to return the input as-is, or to advance. It also requires an
argument of 'GenericList **' to next(), solely because the first
iteration might need to modify the caller's GenericList head, so
that all other calls have to do a layer of dereferencing.
Thankfully, we only have two uses of list visits in the entire
code base: one in spapr_drc (which completely avoids
visit_next_list(), feeding in integers from a different source
than uint8List), and one in qapi-visit.py. That is, all other
list visitors are generated in qapi-visit.c, and share the same
paradigm based on a qapi FooList type, so we can refactor how
lists are laid out with minimal churn among clients.
We can greatly simplify things by hoisting the special case
into the start() routine, and flipping the order in the loop
to visit before advance:
start(head)
for (tail = *head; tail; tail = next(tail)) {
visit(&tail->value)
}
With the simpler semantics, visitors have less state to track,
the argument to next() is reduced to 'GenericList *', and it
also becomes obvious whether an input visitor is allocating a
FooList during visit_start_list() (rather than the old way of
not knowing if an allocation happened until the first
visit_next_list()). As a minor drawback, we now allocate in
two functions instead of one, and have to pass the size to
both functions (unless we were to tweak the input visitors to
cache the size to start_list for reuse during next_list, but
that defeats the goal of less visitor state).
The signature of visit_start_list() is chosen to match
visit_start_struct(), with the new parameters after 'name'.
The spapr_drc case is a virtual visit, done by passing NULL for
list, similarly to how NULL is passed to visit_start_struct()
when a qapi type is not used in those visits. It was easy to
provide these semantics for qmp-output and dealloc visitors,
and a bit harder for qmp-input (several prerequisite patches
refactored things to make this patch straightforward). But it
turned out that the string and opts visitors munge enough other
state during visit_next_list() to make it easier to just
document and require a GenericList visit for now; an assertion
will remind us to adjust things if we need the semantics in the
future.
Several pre-requisite cleanup patches made the reshuffling of
the various visitors easier; particularly the qmp input visitor.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-24-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:31 +03:00
|
|
|
static GenericList *qmp_output_next_list(Visitor *v, GenericList *tail,
|
qapi: Adjust layout of FooList types
By sticking the next pointer first, we don't need a union with
64-bit padding for smaller types. On 32-bit platforms, this
can reduce the size of uint8List from 16 bytes (or 12, depending
on whether 64-bit ints can tolerate 4-byte alignment) down to 8.
It has no effect on 64-bit platforms (where alignment still
dictates a 16-byte struct); but fewer anonymous unions is still
a win in my book.
It requires visit_next_list() to gain a size parameter, to know
what size element to allocate; comparable to the size parameter
of visit_start_struct().
I debated about going one step further, to allow for fewer casts,
by doing:
typedef GenericList GenericList;
struct GenericList {
GenericList *next;
};
struct FooList {
GenericList base;
Foo *value;
};
so that you convert to 'GenericList *' by '&foolist->base', and
back by 'container_of(generic, GenericList, base)' (as opposed to
the existing '(GenericList *)foolist' and '(FooList *)generic').
But doing that would require hoisting the declaration of
GenericList prior to inclusion of qapi-types.h, rather than its
current spot in visitor.h; it also makes iteration a bit more
verbose through 'foolist->base.next' instead of 'foolist->next'.
Note that for lists of objects, the 'value' payload is still
hidden behind a boxed pointer. Someday, it would be nice to do:
struct FooList {
FooList *next;
Foo value;
};
for one less level of malloc for each list element. This patch
is a step in that direction (now that 'next' is no longer at a
fixed non-zero offset within the struct, we can store more than
just a pointer's-worth of data as the value payload), but the
actual conversion would be a task for another series, as it will
touch a lot of code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1455778109-6278-10-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-02-18 09:48:23 +03:00
|
|
|
size_t size)
|
2011-07-19 23:50:34 +04:00
|
|
|
{
|
qapi: Simplify semantics of visit_next_list()
The semantics of the list visit are somewhat baroque, with the
following pseudocode when FooList is used:
start()
for (prev = head; cur = next(prev); prev = &cur) {
visit(&cur->value)
}
Note that these semantics (advance before visit) requires that
the first call to next() return the list head, while all other
calls return the next element of the list; that is, every visitor
implementation is required to track extra state to decide whether
to return the input as-is, or to advance. It also requires an
argument of 'GenericList **' to next(), solely because the first
iteration might need to modify the caller's GenericList head, so
that all other calls have to do a layer of dereferencing.
Thankfully, we only have two uses of list visits in the entire
code base: one in spapr_drc (which completely avoids
visit_next_list(), feeding in integers from a different source
than uint8List), and one in qapi-visit.py. That is, all other
list visitors are generated in qapi-visit.c, and share the same
paradigm based on a qapi FooList type, so we can refactor how
lists are laid out with minimal churn among clients.
We can greatly simplify things by hoisting the special case
into the start() routine, and flipping the order in the loop
to visit before advance:
start(head)
for (tail = *head; tail; tail = next(tail)) {
visit(&tail->value)
}
With the simpler semantics, visitors have less state to track,
the argument to next() is reduced to 'GenericList *', and it
also becomes obvious whether an input visitor is allocating a
FooList during visit_start_list() (rather than the old way of
not knowing if an allocation happened until the first
visit_next_list()). As a minor drawback, we now allocate in
two functions instead of one, and have to pass the size to
both functions (unless we were to tweak the input visitors to
cache the size to start_list for reuse during next_list, but
that defeats the goal of less visitor state).
The signature of visit_start_list() is chosen to match
visit_start_struct(), with the new parameters after 'name'.
The spapr_drc case is a virtual visit, done by passing NULL for
list, similarly to how NULL is passed to visit_start_struct()
when a qapi type is not used in those visits. It was easy to
provide these semantics for qmp-output and dealloc visitors,
and a bit harder for qmp-input (several prerequisite patches
refactored things to make this patch straightforward). But it
turned out that the string and opts visitors munge enough other
state during visit_next_list() to make it easier to just
document and require a GenericList visit for now; an assertion
will remind us to adjust things if we need the semantics in the
future.
Several pre-requisite cleanup patches made the reshuffling of
the various visitors easier; particularly the qmp input visitor.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-24-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:31 +03:00
|
|
|
return tail->next;
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
2016-01-29 16:48:59 +03:00
|
|
|
static void qmp_output_end_list(Visitor *v)
|
2011-07-19 23:50:34 +04:00
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
2016-04-29 00:45:26 +03:00
|
|
|
QObject *value = qmp_output_pop(qov);
|
|
|
|
assert(qobject_type(value) == QTYPE_QLIST);
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
2016-01-29 16:48:56 +03: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 16:48:49 +03:00
|
|
|
Error **errp)
|
2011-07-19 23:50:34 +04:00
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_add(qov, name, qint_from_int(*obj));
|
|
|
|
}
|
|
|
|
|
2016-01-29 16:48:56 +03: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 16:48:50 +03: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 16:48:56 +03:00
|
|
|
static void qmp_output_type_bool(Visitor *v, const char *name, bool *obj,
|
2011-07-19 23:50:34 +04:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
2015-05-16 01:24:59 +03:00
|
|
|
qmp_output_add(qov, name, qbool_from_bool(*obj));
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
2016-01-29 16:48:56 +03:00
|
|
|
static void qmp_output_type_str(Visitor *v, const char *name, char **obj,
|
2011-07-19 23:50:34 +04: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 16:48:56 +03:00
|
|
|
static void qmp_output_type_number(Visitor *v, const char *name, double *obj,
|
2011-07-19 23:50:34 +04:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_add(qov, name, qfloat_from_double(*obj));
|
|
|
|
}
|
|
|
|
|
2016-01-29 16:48:56 +03:00
|
|
|
static void qmp_output_type_any(Visitor *v, const char *name, QObject **obj,
|
2015-09-16 14:06:24 +03:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qobject_incref(*obj);
|
|
|
|
qmp_output_add_obj(qov, name, *obj);
|
|
|
|
}
|
|
|
|
|
qapi: Add visit_type_null() visitor
Right now, qmp-output-visitor happens to produce a QNull result
if nothing is actually visited between the creation of the visitor
and the request for the resulting QObject. A stronger protocol
would require that a QMP output visit MUST visit something. But
to still be able to produce a JSON 'null' output, we need a new
visitor function that states our intentions. Yes, we could say
that such a visit must go through visit_type_any(), but that
feels clunky.
So this patch introduces the new visit_type_null() interface and
its no-op interface in the dealloc visitor, and stubs in the
qmp visitors (the next patch will finish the implementation).
For the visitors that will not implement the callback, document
the situation. The code in qapi-visit-core unconditionally
dereferences the callback pointer, so that a segfault will inform
a developer if they need to implement the callback for their
choice of visitor.
Note that JSON has a primitive null type, with the single value
null; likewise with the QNull type for QObject; but for QAPI,
we just have the 'null' value without a null type. We may
eventually want to add more support in QAPI for null (most likely,
we'd use it via an alternate type that permits 'null' or an
object); but we'll create that usage when we need it.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:22 +03:00
|
|
|
static void qmp_output_type_null(Visitor *v, const char *name, Error **errp)
|
|
|
|
{
|
2016-04-29 00:45:23 +03:00
|
|
|
QmpOutputVisitor *qov = to_qov(v);
|
|
|
|
qmp_output_add_obj(qov, name, qnull());
|
qapi: Add visit_type_null() visitor
Right now, qmp-output-visitor happens to produce a QNull result
if nothing is actually visited between the creation of the visitor
and the request for the resulting QObject. A stronger protocol
would require that a QMP output visit MUST visit something. But
to still be able to produce a JSON 'null' output, we need a new
visitor function that states our intentions. Yes, we could say
that such a visit must go through visit_type_any(), but that
feels clunky.
So this patch introduces the new visit_type_null() interface and
its no-op interface in the dealloc visitor, and stubs in the
qmp visitors (the next patch will finish the implementation).
For the visitors that will not implement the callback, document
the situation. The code in qapi-visit-core unconditionally
dereferences the callback pointer, so that a segfault will inform
a developer if they need to implement the callback for their
choice of visitor.
Note that JSON has a primitive null type, with the single value
null; likewise with the QNull type for QObject; but for QAPI,
we just have the 'null' value without a null type. We may
eventually want to add more support in QAPI for null (most likely,
we'd use it via an alternate type that permits 'null' or an
object); but we'll create that usage when we need it.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:22 +03:00
|
|
|
}
|
|
|
|
|
2016-04-29 00:45:26 +03:00
|
|
|
/* Finish building, and return the root object.
|
|
|
|
* The root object is never null. The caller becomes the object's
|
|
|
|
* owner, and should use qobject_decref() when done with it. */
|
2011-07-19 23:50:34 +04:00
|
|
|
QObject *qmp_output_get_qobject(QmpOutputVisitor *qov)
|
|
|
|
{
|
2016-04-29 00:45:26 +03:00
|
|
|
/* A visit must have occurred, with each start paired with end. */
|
|
|
|
assert(qov->root && QTAILQ_EMPTY(&qov->stack));
|
|
|
|
|
|
|
|
qobject_incref(qov->root);
|
|
|
|
return qov->root;
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
Visitor *qmp_output_get_visitor(QmpOutputVisitor *v)
|
|
|
|
{
|
|
|
|
return &v->visitor;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qmp_output_visitor_cleanup(QmpOutputVisitor *v)
|
|
|
|
{
|
|
|
|
QStackEntry *e, *tmp;
|
|
|
|
|
|
|
|
QTAILQ_FOREACH_SAFE(e, &v->stack, node, tmp) {
|
|
|
|
QTAILQ_REMOVE(&v->stack, e, node);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(e);
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
2016-01-29 16:49:01 +03:00
|
|
|
qobject_decref(v->root);
|
2011-08-21 07:09:37 +04:00
|
|
|
g_free(v);
|
2011-07-19 23:50:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
QmpOutputVisitor *qmp_output_visitor_new(void)
|
|
|
|
{
|
|
|
|
QmpOutputVisitor *v;
|
|
|
|
|
2011-08-21 07:09:37 +04:00
|
|
|
v = g_malloc0(sizeof(*v));
|
2011-07-19 23:50:34 +04:00
|
|
|
|
2016-04-29 00:45:09 +03:00
|
|
|
v->visitor.type = VISITOR_OUTPUT;
|
2011-07-19 23:50:34 +04: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;
|
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 16:48:49 +03: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 16:48:50 +03:00
|
|
|
v->visitor.type_uint64 = qmp_output_type_uint64;
|
2011-07-19 23:50:34 +04: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 14:06:24 +03:00
|
|
|
v->visitor.type_any = qmp_output_type_any;
|
qapi: Add visit_type_null() visitor
Right now, qmp-output-visitor happens to produce a QNull result
if nothing is actually visited between the creation of the visitor
and the request for the resulting QObject. A stronger protocol
would require that a QMP output visit MUST visit something. But
to still be able to produce a JSON 'null' output, we need a new
visitor function that states our intentions. Yes, we could say
that such a visit must go through visit_type_any(), but that
feels clunky.
So this patch introduces the new visit_type_null() interface and
its no-op interface in the dealloc visitor, and stubs in the
qmp visitors (the next patch will finish the implementation).
For the visitors that will not implement the callback, document
the situation. The code in qapi-visit-core unconditionally
dereferences the callback pointer, so that a segfault will inform
a developer if they need to implement the callback for their
choice of visitor.
Note that JSON has a primitive null type, with the single value
null; likewise with the QNull type for QObject; but for QAPI,
we just have the 'null' value without a null type. We may
eventually want to add more support in QAPI for null (most likely,
we'd use it via an alternate type that permits 'null' or an
object); but we'll create that usage when we need it.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-15-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-04-29 00:45:22 +03:00
|
|
|
v->visitor.type_null = qmp_output_type_null;
|
2011-07-19 23:50:34 +04:00
|
|
|
|
|
|
|
QTAILQ_INIT(&v->stack);
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|