2015-08-21 07:04:50 +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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2018-02-19 06:29:26 +00:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Backports commit da34e65cb4025728566d6504a99916f6e7e1dd6a from qemu
2018-02-22 04:05:15 +00:00
|
|
|
#include "qapi/error.h"
|
2018-02-26 20:42:25 +00:00
|
|
|
#include "qapi/qobject-output-visitor.h"
|
2015-08-21 07:04:50 +00:00
|
|
|
#include "qapi/visitor-impl.h"
|
|
|
|
#include "qemu/queue.h"
|
|
|
|
#include "qemu-common.h"
|
2018-03-07 17:32:39 +00:00
|
|
|
#include "qapi/qmp/qbool.h"
|
|
|
|
#include "qapi/qmp/qdict.h"
|
|
|
|
#include "qapi/qmp/qlist.h"
|
2018-03-08 13:50:04 +00:00
|
|
|
#include "qapi/qmp/qnull.h"
|
|
|
|
#include "qapi/qmp/qnum.h"
|
2018-03-07 17:32:39 +00:00
|
|
|
#include "qapi/qmp/qstring.h"
|
2015-08-21 07:04:50 +00:00
|
|
|
#include "qapi/qmp/qerror.h"
|
|
|
|
|
|
|
|
typedef struct QStackEntry
|
|
|
|
{
|
|
|
|
QObject *value;
|
qapi: Add parameter to visit_end_*
Rather than making the dealloc visitor track of stack of pointers
remembered during visit_start_* in order to free them during
visit_end_*, it's a lot easier to just make all callers pass the
same pointer to visit_end_*. The generated code has access to the
same pointer, while all other users are doing virtual walks and
can pass NULL. The dealloc visitor is then greatly simplified.
All three visit_end_*() functions intentionally take a void**,
even though the visit_start_*() functions differ between void**,
GenericList**, and GenericAlternate**. This is done for several
reasons: when doing a virtual walk, passing NULL doesn't care
what the type is, but when doing a generated walk, we already
have to cast the caller's specific FOO* to call visit_start,
while using void** lets us use visit_end without a cast. Also,
an upcoming patch will add a clone visitor that wants to use
the same implementation for all three visit_end callbacks,
which is made easier if all three share the same signature.
For visitors with already track per-object state (the QMP visitors
via a stack, and the string visitors which do not allow nesting),
add an assertion that the caller is indeed passing the same
pointer to paired calls.
Backports commit 1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271 from qemu
2018-02-25 05:53:31 +00:00
|
|
|
void *qapi; /* sanity check that caller uses same pointer */
|
2018-02-26 00:52:34 +00:00
|
|
|
QSLIST_ENTRY(QStackEntry) node;
|
2015-08-21 07:04:50 +00:00
|
|
|
} QStackEntry;
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
struct QObjectOutputVisitor
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
Visitor visitor;
|
2018-02-26 00:52:34 +00:00
|
|
|
QSLIST_HEAD(, QStackEntry) stack; /* Stack of unfinished containers */
|
2018-02-20 13:09:55 +00:00
|
|
|
QObject *root; /* Root of the output visit */
|
qapi: Add new visit_complete() function
Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base. Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors. For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
| QDict *qmp;
| Error *err = NULL;
| QMPEventFuncEmit emit;
|- QmpOutputVisitor *qov;
|+ QObject *obj;
| Visitor *v;
| q_obj_ACPI_DEVICE_OST_arg param = {
| info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
| qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|- qov = qmp_output_visitor_new();
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(&obj);
|
| visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
| if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
|
|- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+ visit_complete(v, &obj);
|+ qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
| Error *err = NULL;
|- QmpOutputVisitor *qov = qmp_output_visitor_new();
| Visitor *v;
|
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(ret_out);
| visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|- if (err) {
|- goto out;
|+ if (!err) {
|+ visit_complete(v, ret_out);
| }
|- *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
| error_propagate(errp, err);
Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
2018-02-25 06:20:00 +00:00
|
|
|
QObject **result; /* User's storage location for result */
|
2015-08-21 07:04:50 +00:00
|
|
|
};
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
#define qobject_output_add(qov, name, value) \
|
|
|
|
qobject_output_add_obj(qov, name, QOBJECT(value))
|
|
|
|
#define qobject_output_push(qov, value, qapi) \
|
|
|
|
qobject_output_push_obj(qov, QOBJECT(value), qapi)
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static QObjectOutputVisitor *to_qov(Visitor *v)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
return container_of(v, QObjectOutputVisitor, visitor);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 13:07:24 +00:00
|
|
|
/* Push @value onto the stack of current QObjects being built */
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_push_obj(QObjectOutputVisitor *qov, QObject *value,
|
|
|
|
void *qapi)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QStackEntry *e = g_malloc0(sizeof(*e));
|
|
|
|
|
2018-02-20 13:09:55 +00:00
|
|
|
assert(qov->root);
|
2018-02-20 13:07:24 +00:00
|
|
|
assert(value);
|
2015-08-21 07:04:50 +00:00
|
|
|
e->value = value;
|
qapi: Add parameter to visit_end_*
Rather than making the dealloc visitor track of stack of pointers
remembered during visit_start_* in order to free them during
visit_end_*, it's a lot easier to just make all callers pass the
same pointer to visit_end_*. The generated code has access to the
same pointer, while all other users are doing virtual walks and
can pass NULL. The dealloc visitor is then greatly simplified.
All three visit_end_*() functions intentionally take a void**,
even though the visit_start_*() functions differ between void**,
GenericList**, and GenericAlternate**. This is done for several
reasons: when doing a virtual walk, passing NULL doesn't care
what the type is, but when doing a generated walk, we already
have to cast the caller's specific FOO* to call visit_start,
while using void** lets us use visit_end without a cast. Also,
an upcoming patch will add a clone visitor that wants to use
the same implementation for all three visit_end callbacks,
which is made easier if all three share the same signature.
For visitors with already track per-object state (the QMP visitors
via a stack, and the string visitors which do not allow nesting),
add an assertion that the caller is indeed passing the same
pointer to paired calls.
Backports commit 1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271 from qemu
2018-02-25 05:53:31 +00:00
|
|
|
e->qapi = qapi;
|
2018-02-26 00:52:34 +00:00
|
|
|
QSLIST_INSERT_HEAD(&qov->stack, e, node);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 13:07:24 +00:00
|
|
|
/* Pop a value off the stack of QObjects being built, and return it. */
|
2018-02-27 12:53:17 +00:00
|
|
|
static QObject *qobject_output_pop(QObjectOutputVisitor *qov, void *qapi)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-26 00:52:34 +00:00
|
|
|
QStackEntry *e = QSLIST_FIRST(&qov->stack);
|
2015-08-21 07:04:50 +00:00
|
|
|
QObject *value;
|
2018-02-20 13:07:24 +00:00
|
|
|
|
|
|
|
assert(e);
|
qapi: Add parameter to visit_end_*
Rather than making the dealloc visitor track of stack of pointers
remembered during visit_start_* in order to free them during
visit_end_*, it's a lot easier to just make all callers pass the
same pointer to visit_end_*. The generated code has access to the
same pointer, while all other users are doing virtual walks and
can pass NULL. The dealloc visitor is then greatly simplified.
All three visit_end_*() functions intentionally take a void**,
even though the visit_start_*() functions differ between void**,
GenericList**, and GenericAlternate**. This is done for several
reasons: when doing a virtual walk, passing NULL doesn't care
what the type is, but when doing a generated walk, we already
have to cast the caller's specific FOO* to call visit_start,
while using void** lets us use visit_end without a cast. Also,
an upcoming patch will add a clone visitor that wants to use
the same implementation for all three visit_end callbacks,
which is made easier if all three share the same signature.
For visitors with already track per-object state (the QMP visitors
via a stack, and the string visitors which do not allow nesting),
add an assertion that the caller is indeed passing the same
pointer to paired calls.
Backports commit 1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271 from qemu
2018-02-25 05:53:31 +00:00
|
|
|
assert(e->qapi == qapi);
|
2018-02-26 00:52:34 +00:00
|
|
|
QSLIST_REMOVE_HEAD(&qov->stack, node);
|
2015-08-21 07:04:50 +00:00
|
|
|
value = e->value;
|
2018-02-20 13:07:24 +00:00
|
|
|
assert(value);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(e);
|
2015-08-21 07:04:50 +00:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2018-02-20 13:07:24 +00: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. */
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_add_obj(QObjectOutputVisitor *qov, const char *name,
|
|
|
|
QObject *value)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-26 00:52:34 +00:00
|
|
|
QStackEntry *e = QSLIST_FIRST(&qov->stack);
|
2018-02-20 13:09:55 +00:00
|
|
|
QObject *cur = e ? e->value : NULL;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-20 13:09:55 +00:00
|
|
|
if (!cur) {
|
2018-02-24 00:04:38 +00:00
|
|
|
/* Don't allow reuse of visitor on more than one root */
|
|
|
|
assert(!qov->root);
|
2018-02-20 13:09:55 +00:00
|
|
|
qov->root = value;
|
|
|
|
} else {
|
|
|
|
switch (qobject_type(cur)) {
|
|
|
|
case QTYPE_QDICT:
|
|
|
|
assert(name);
|
2018-03-20 14:52:49 +00:00
|
|
|
qdict_put_obj(qobject_to(QDict, cur), name, value);
|
2018-02-20 13:09:55 +00:00
|
|
|
break;
|
|
|
|
case QTYPE_QLIST:
|
2018-02-24 00:04:38 +00:00
|
|
|
assert(!name);
|
2018-03-20 14:52:49 +00:00
|
|
|
qlist_append_obj(qobject_to(QList, cur), value);
|
2018-02-20 13:09:55 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_start_struct(Visitor *v, const char *name, void **obj,
|
|
|
|
size_t unused, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2015-08-21 07:04:50 +00:00
|
|
|
QDict *dict = qdict_new();
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
qobject_output_add(qov, name, dict);
|
|
|
|
qobject_output_push(qov, dict, obj);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_end_struct(Visitor *v, void **obj)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
|
|
|
QObject *value = qobject_output_pop(qov, obj);
|
2018-02-24 00:04:38 +00:00
|
|
|
assert(qobject_type(value) == QTYPE_QDICT);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_start_list(Visitor *v, const char *name,
|
|
|
|
GenericList **listp, size_t size,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2015-08-21 07:04:50 +00:00
|
|
|
QList *list = qlist_new();
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
qobject_output_add(qov, name, list);
|
|
|
|
qobject_output_push(qov, list, listp);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static GenericList *qobject_output_next_list(Visitor *v, GenericList *tail,
|
|
|
|
size_t size)
|
2015-08-21 07:04:50 +00: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.
Backports commit d9f62dde1303286b24ac8ce88be27e2b9b9c5f46 from qemu
2018-02-24 00:44:26 +00:00
|
|
|
return tail->next;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_end_list(Visitor *v, void **obj)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
|
|
|
QObject *value = qobject_output_pop(qov, obj);
|
2018-02-24 00:04:38 +00:00
|
|
|
assert(qobject_type(value) == QTYPE_QLIST);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_type_int64(Visitor *v, const char *name, int64_t *obj,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2018-03-03 22:43:24 +00:00
|
|
|
qobject_output_add(qov, name, qnum_from_int(*obj));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-03-03 23:39:10 +00:00
|
|
|
static void qobject_output_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.
Backports commit f755dea79dc81b0d6a8f6414e0672e165e28d8ba from qemu
2018-02-19 16:57:56 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2018-03-03 23:39:10 +00:00
|
|
|
qobject_output_add(qov, name, qnum_from_uint(*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.
Backports commit f755dea79dc81b0d6a8f6414e0672e165e28d8ba from qemu
2018-02-19 16:57:56 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_type_bool(Visitor *v, const char *name, bool *obj,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
|
|
|
qobject_output_add(qov, name, qbool_from_bool(*obj));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_type_str(Visitor *v, const char *name, char **obj,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (*obj) {
|
2018-02-27 12:53:17 +00:00
|
|
|
qobject_output_add(qov, name, qstring_from_str(*obj));
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
2018-02-27 12:53:17 +00:00
|
|
|
qobject_output_add(qov, name, qstring_from_str(""));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_type_number(Visitor *v, const char *name, double *obj,
|
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2018-03-03 22:43:24 +00:00
|
|
|
qobject_output_add(qov, name, qnum_from_double(*obj));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_type_any(Visitor *v, const char *name, QObject **obj,
|
|
|
|
Error **errp)
|
2018-02-19 22:45:25 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2018-05-04 14:18:28 +00:00
|
|
|
qobject_output_add_obj(qov, name, qobject_ref(*obj));
|
2018-02-19 22:45:25 +00:00
|
|
|
}
|
|
|
|
|
2018-03-07 21:49:20 +00:00
|
|
|
static void qobject_output_type_null(Visitor *v, const char *name,
|
|
|
|
QNull **obj, Error **errp)
|
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.
Backports commit 3bc97fd5924561d92f32758c67eaffd2e4e25038 from qemu
2018-02-23 20:48:53 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2018-03-07 21:43:41 +00:00
|
|
|
qobject_output_add(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.
Backports commit 3bc97fd5924561d92f32758c67eaffd2e4e25038 from qemu
2018-02-23 20:48:53 +00:00
|
|
|
}
|
|
|
|
|
2018-02-24 00:04:38 +00:00
|
|
|
/* Finish building, and return the root object.
|
|
|
|
* The root object is never null. The caller becomes the object's
|
2018-05-04 14:04:29 +00:00
|
|
|
* owner, and should use qobject_unref() when done with it. */
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_complete(Visitor *v, void *opaque)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
qapi: Add new visit_complete() function
Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base. Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors. For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
| QDict *qmp;
| Error *err = NULL;
| QMPEventFuncEmit emit;
|- QmpOutputVisitor *qov;
|+ QObject *obj;
| Visitor *v;
| q_obj_ACPI_DEVICE_OST_arg param = {
| info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
| qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|- qov = qmp_output_visitor_new();
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(&obj);
|
| visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
| if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
|
|- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+ visit_complete(v, &obj);
|+ qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
| Error *err = NULL;
|- QmpOutputVisitor *qov = qmp_output_visitor_new();
| Visitor *v;
|
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(ret_out);
| visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|- if (err) {
|- goto out;
|+ if (!err) {
|+ visit_complete(v, ret_out);
| }
|- *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
| error_propagate(errp, err);
Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
2018-02-25 06:20:00 +00:00
|
|
|
|
2018-02-24 00:04:38 +00:00
|
|
|
/* A visit must have occurred, with each start paired with end. */
|
2018-02-26 00:52:34 +00:00
|
|
|
assert(qov->root && QSLIST_EMPTY(&qov->stack));
|
qapi: Add new visit_complete() function
Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base. Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors. For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
| QDict *qmp;
| Error *err = NULL;
| QMPEventFuncEmit emit;
|- QmpOutputVisitor *qov;
|+ QObject *obj;
| Visitor *v;
| q_obj_ACPI_DEVICE_OST_arg param = {
| info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
| qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|- qov = qmp_output_visitor_new();
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(&obj);
|
| visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
| if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
|
|- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+ visit_complete(v, &obj);
|+ qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
| Error *err = NULL;
|- QmpOutputVisitor *qov = qmp_output_visitor_new();
| Visitor *v;
|
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(ret_out);
| visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|- if (err) {
|- goto out;
|+ if (!err) {
|+ visit_complete(v, ret_out);
| }
|- *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
| error_propagate(errp, err);
Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
2018-02-25 06:20:00 +00:00
|
|
|
assert(opaque == qov->result);
|
2018-02-24 00:04:38 +00:00
|
|
|
|
qapi: Add new visit_complete() function
Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base. Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors. For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
| QDict *qmp;
| Error *err = NULL;
| QMPEventFuncEmit emit;
|- QmpOutputVisitor *qov;
|+ QObject *obj;
| Visitor *v;
| q_obj_ACPI_DEVICE_OST_arg param = {
| info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
| qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|- qov = qmp_output_visitor_new();
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(&obj);
|
| visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
| if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
|
|- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+ visit_complete(v, &obj);
|+ qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
| Error *err = NULL;
|- QmpOutputVisitor *qov = qmp_output_visitor_new();
| Visitor *v;
|
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(ret_out);
| visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|- if (err) {
|- goto out;
|+ if (!err) {
|+ visit_complete(v, ret_out);
| }
|- *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
| error_propagate(errp, err);
Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
2018-02-25 06:20:00 +00:00
|
|
|
*qov->result = qov->root;
|
|
|
|
qov->result = NULL;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
static void qobject_output_free(Visitor *v)
|
qapi: Add new visit_free() function
Making each visitor provide its own (awkwardly-named) FOO_cleanup()
is unusual, when we can instead have a polymorphic visit_free()
interface. Over the next few patches, we can use the polymorphic
functions to eliminate the need for a FOO_get_visitor() function
for accessing specific visitor functionality, once everything can
be accessed directly through the Visitor* interfaces.
The dealloc visitor is the first one converted to completely use
the new entry point, since qapi_dealloc_visitor_cleanup() was the
only reason that qapi_dealloc_get_visitor() existed, and only
generated and testsuite code was even using it. With the new
visit_free() entry point in place, we no longer need to expose
the QapiDeallocVisitor subtype through qapi_dealloc_visitor_new(),
and can get by with less generated code, with diffs that look like:
| void qapi_free_ACPIOSTInfo(ACPIOSTInfo *obj)
| {
|- QapiDeallocVisitor *qdv;
| Visitor *v;
|
| if (!obj) {
| return;
| }
|
|- qdv = qapi_dealloc_visitor_new();
|- v = qapi_dealloc_get_visitor(qdv);
|+ v = qapi_dealloc_visitor_new();
| visit_type_ACPIOSTInfo(v, NULL, &obj, NULL);
|- qapi_dealloc_visitor_cleanup(qdv);
|+ visit_free(v);
|}
Backports commit 2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c from qemu
2018-02-25 06:02:56 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *qov = to_qov(v);
|
2018-02-26 00:52:34 +00:00
|
|
|
QStackEntry *e;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-26 00:52:34 +00:00
|
|
|
while (!QSLIST_EMPTY(&qov->stack)) {
|
|
|
|
e = QSLIST_FIRST(&qov->stack);
|
|
|
|
QSLIST_REMOVE_HEAD(&qov->stack, node);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(e);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-05-04 14:04:29 +00:00
|
|
|
qobject_unref(qov->root);
|
2018-02-25 06:12:22 +00:00
|
|
|
g_free(qov);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-27 12:53:17 +00:00
|
|
|
Visitor *qobject_output_visitor_new(QObject **result)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
2018-02-27 12:53:17 +00:00
|
|
|
QObjectOutputVisitor *v;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
v = g_malloc0(sizeof(*v));
|
|
|
|
|
2018-02-23 19:25:19 +00:00
|
|
|
v->visitor.type = VISITOR_OUTPUT;
|
2018-02-27 12:53:17 +00:00
|
|
|
v->visitor.start_struct = qobject_output_start_struct;
|
|
|
|
v->visitor.end_struct = qobject_output_end_struct;
|
|
|
|
v->visitor.start_list = qobject_output_start_list;
|
|
|
|
v->visitor.next_list = qobject_output_next_list;
|
|
|
|
v->visitor.end_list = qobject_output_end_list;
|
|
|
|
v->visitor.type_int64 = qobject_output_type_int64;
|
|
|
|
v->visitor.type_uint64 = qobject_output_type_uint64;
|
|
|
|
v->visitor.type_bool = qobject_output_type_bool;
|
|
|
|
v->visitor.type_str = qobject_output_type_str;
|
|
|
|
v->visitor.type_number = qobject_output_type_number;
|
|
|
|
v->visitor.type_any = qobject_output_type_any;
|
|
|
|
v->visitor.type_null = qobject_output_type_null;
|
|
|
|
v->visitor.complete = qobject_output_complete;
|
|
|
|
v->visitor.free = qobject_output_free;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
qapi: Add new visit_complete() function
Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base. Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors. For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
| QDict *qmp;
| Error *err = NULL;
| QMPEventFuncEmit emit;
|- QmpOutputVisitor *qov;
|+ QObject *obj;
| Visitor *v;
| q_obj_ACPI_DEVICE_OST_arg param = {
| info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
| qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|- qov = qmp_output_visitor_new();
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(&obj);
|
| visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
| if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
|
|- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+ visit_complete(v, &obj);
|+ qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
| Error *err = NULL;
|- QmpOutputVisitor *qov = qmp_output_visitor_new();
| Visitor *v;
|
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(ret_out);
| visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|- if (err) {
|- goto out;
|+ if (!err) {
|+ visit_complete(v, ret_out);
| }
|- *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
| error_propagate(errp, err);
Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
2018-02-25 06:20:00 +00:00
|
|
|
*result = NULL;
|
|
|
|
v->result = result;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
qapi: Add new visit_complete() function
Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base. Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors. For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
| QDict *qmp;
| Error *err = NULL;
| QMPEventFuncEmit emit;
|- QmpOutputVisitor *qov;
|+ QObject *obj;
| Visitor *v;
| q_obj_ACPI_DEVICE_OST_arg param = {
| info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
| qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|- qov = qmp_output_visitor_new();
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(&obj);
|
| visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
| if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
| goto out;
| }
|
|- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+ visit_complete(v, &obj);
|+ qdict_put_obj(qmp, "data", obj);
| emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
| Error *err = NULL;
|- QmpOutputVisitor *qov = qmp_output_visitor_new();
| Visitor *v;
|
|- v = qmp_output_get_visitor(qov);
|+ v = qmp_output_visitor_new(ret_out);
| visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|- if (err) {
|- goto out;
|+ if (!err) {
|+ visit_complete(v, ret_out);
| }
|- *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
| error_propagate(errp, err);
Backports commit 3b098d56979d2f7fd707c5be85555d114353a28d from qemu
2018-02-25 06:20:00 +00:00
|
|
|
return &v->visitor;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|