2015-08-21 07:04:50 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
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"
|
2015-08-21 07:04:50 +00:00
|
|
|
#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
|
|
|
|
{
|
2018-02-23 20:01:51 +00:00
|
|
|
QObject *obj; /* Object being visited */
|
|
|
|
|
|
|
|
GHashTable *h; /* If obj is dict: unvisited keys */
|
|
|
|
const QListEntry *entry; /* If obj is list: unvisited tail */
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
bool first; /* If obj is list: next_list() not yet called? */
|
2015-08-21 07:04:50 +00:00
|
|
|
} StackObject;
|
|
|
|
|
|
|
|
struct QmpInputVisitor
|
|
|
|
{
|
|
|
|
Visitor visitor;
|
2018-02-23 20:01:51 +00:00
|
|
|
|
2018-02-23 20:16:40 +00:00
|
|
|
/* Root of visit at visitor creation. */
|
|
|
|
QObject *root;
|
|
|
|
|
|
|
|
/* Stack of objects being visited (all entries will be either
|
|
|
|
* QDict or QList). */
|
2015-08-21 07:04:50 +00:00
|
|
|
StackObject stack[QIV_STACK_SIZE];
|
|
|
|
int nb_stack;
|
2018-02-23 20:01:51 +00:00
|
|
|
|
|
|
|
/* True to reject parse in visit_end_struct() if unvisited keys remain. */
|
2015-08-21 07:04:50 +00:00
|
|
|
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)
|
|
|
|
{
|
2018-02-23 20:16:40 +00:00
|
|
|
StackObject *tos;
|
|
|
|
QObject *qobj;
|
2018-02-23 20:12:55 +00:00
|
|
|
QObject *ret;
|
2018-02-23 20:01:51 +00:00
|
|
|
|
2018-02-23 20:16:40 +00:00
|
|
|
if (!qiv->nb_stack) {
|
|
|
|
/* Starting at root, name is ignored. */
|
|
|
|
return qiv->root;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We are in a container; find the next element. */
|
|
|
|
tos = &qiv->stack[qiv->nb_stack - 1];
|
|
|
|
qobj = tos->obj;
|
2018-02-23 20:01:51 +00:00
|
|
|
assert(qobj);
|
|
|
|
|
2018-02-23 20:16:40 +00:00
|
|
|
if (qobject_type(qobj) == QTYPE_QDICT) {
|
|
|
|
assert(name);
|
2018-02-23 20:12:55 +00:00
|
|
|
ret = qdict_get(qobject_to_qdict(qobj), name);
|
|
|
|
if (tos->h && consume && ret) {
|
|
|
|
bool removed = g_hash_table_remove(tos->h, name);
|
|
|
|
assert(removed);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
2018-02-23 20:16:40 +00:00
|
|
|
} else {
|
2018-02-23 20:01:51 +00:00
|
|
|
assert(qobject_type(qobj) == QTYPE_QLIST);
|
2018-02-23 20:16:40 +00:00
|
|
|
assert(!name);
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
assert(!tos->first);
|
2018-02-23 20:16:40 +00:00
|
|
|
ret = qlist_entry_obj(tos->entry);
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
if (consume) {
|
|
|
|
tos->entry = qlist_next(tos->entry);
|
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-23 20:16:40 +00:00
|
|
|
return ret;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
2018-02-23 20:01:51 +00:00
|
|
|
StackObject *tos = &qiv->stack[qiv->nb_stack];
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-23 20:01:51 +00:00
|
|
|
assert(obj);
|
2015-08-21 07:04:50 +00:00
|
|
|
if (qiv->nb_stack >= QIV_STACK_SIZE) {
|
|
|
|
error_setg(errp, "An internal buffer overran");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-23 20:01:51 +00:00
|
|
|
tos->obj = obj;
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
assert(!tos->h);
|
|
|
|
assert(!tos->entry);
|
2015-08-21 07:04:50 +00:00
|
|
|
|
|
|
|
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);
|
2018-02-23 20:01:51 +00:00
|
|
|
tos->h = h;
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
} else if (qobject_type(obj) == QTYPE_QLIST) {
|
|
|
|
tos->entry = qlist_first(qobject_to_qlist(obj));
|
|
|
|
tos->first = true;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
StackObject *tos = &qiv->stack[qiv->nb_stack - 1];
|
2015-08-21 07:04:50 +00:00
|
|
|
assert(qiv->nb_stack > 0);
|
|
|
|
|
|
|
|
if (qiv->strict) {
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
GHashTable *const top_ht = tos->h;
|
2015-08-21 07:04:50 +00:00
|
|
|
if (top_ht) {
|
|
|
|
if (g_hash_table_size(top_ht)) {
|
|
|
|
const char *key;
|
2017-01-19 11:50:28 +00:00
|
|
|
g_hash_table_find(top_ht, always_true, (gpointer)&key);
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_QMP_EXTRA_MEMBER, key);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
g_hash_table_unref(top_ht);
|
|
|
|
}
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
tos->h = NULL;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
qiv->nb_stack--;
|
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
|
2018-02-20 04:42:59 +00:00
|
|
|
size_t size, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
2018-02-23 20:12:55 +00:00
|
|
|
QObject *qobj = qmp_input_get_object(qiv, name, false);
|
2015-08-21 07:04:50 +00:00
|
|
|
Error *err = NULL;
|
|
|
|
|
2018-02-23 19:53:21 +00:00
|
|
|
if (obj) {
|
|
|
|
*obj = NULL;
|
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
if (!qobj || qobject_type(qobj) != QTYPE_QDICT) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"QDict");
|
2015-08-21 07:04:50 +00:00
|
|
|
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);
|
|
|
|
|
2018-02-20 04:44:41 +00:00
|
|
|
qmp_input_pop(qiv, &error_abort);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"list");
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
qmp_input_push(qiv, qobj, errp);
|
|
|
|
}
|
|
|
|
|
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.
Backports commit e65d89bf1a4484e0db0f3dc820a8b209f2fb1e8b from qemu
2018-02-23 19:48:57 +00:00
|
|
|
static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
|
|
|
|
size_t size)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
GenericList *entry;
|
|
|
|
StackObject *so = &qiv->stack[qiv->nb_stack - 1];
|
|
|
|
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
if (!so->entry) {
|
2015-08-21 07:04:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
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.
Backports commit e65d89bf1a4484e0db0f3dc820a8b209f2fb1e8b from qemu
2018-02-23 19:48:57 +00:00
|
|
|
entry = g_malloc0(size);
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
if (so->first) {
|
2015-08-21 07:04:50 +00:00
|
|
|
*list = entry;
|
qmp-input: Refactor when list is advanced
In the QMP input visitor, visiting a list traverses two objects:
the QAPI GenericList of the caller (which gets advanced in
visit_next_list() regardless of this patch), and the QList input
that we are converting to QAPI. For consistency with QDict
visits, we want to consume elements from the input QList during
the visit_type_FOO() for the list element; that is, we want ALL
the code for consuming an input to live in qmp_input_get_object(),
rather than having it split according to whether we are visiting
a dict or a list. Making qmp_input_get_object() the common point
of consumption will make it easier for a later patch to refactor
visit_start_list() to cover the GenericList * head of a QAPI list,
and in turn will get rid of the 'first' flag (which lived in
qmp_input_next_list() pre-patch, and is hoisted to StackObject
by this patch).
This patch is therefore altering the post-condition use of 'entry',
while keeping what gets visited unchanged, from:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry NULL 1st elt 1st elt last elt last elt NULL gone
where type_ELT() returns (entry ? entry : 1st elt) and next_list() steps
entry
to this usage:
start_list next_list type_ELT ... next_list type_ELT next_list end_list
visits 1st elt last elt
entry 1st elt 1nd elt 2nd elt last elt NULL NULL gone
where type_ELT() steps entry and returns the old entry, and next_list()
leaves entry alone.
Backports commit fcf3cb21783b2dae3358fdbe7001cb2f74e0cedf from qemu
2018-02-23 20:19:37 +00:00
|
|
|
so->first = false;
|
2015-08-21 07:04:50 +00:00
|
|
|
} else {
|
|
|
|
(*list)->next = entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
2018-02-19 17:58:24 +00:00
|
|
|
static void qmp_input_end_list(Visitor *v)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
|
2018-02-19 17:48:38 +00:00
|
|
|
qmp_input_pop(qiv, &error_abort);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
qapi: Change visit_start_implicit_struct to visit_start_alternate
After recent changes, the only remaining use of
visit_start_implicit_struct() is for allocating the space needed
when visiting an alternate. Since the term 'implicit struct' is
hard to explain, rename the function to its current usage. While
at it, we can merge the functionality of visit_get_next_type()
into the same function, making it more like visit_start_struct().
Generated code is now slightly smaller:
| {
| Error *err = NULL;
|
|- visit_start_implicit_struct(v, (void**) obj, sizeof(BlockdevRef), &err);
|+ visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj),
|+ true, &err);
| if (err) {
| goto out;
| }
|- visit_get_next_type(v, name, &(*obj)->type, true, &err);
|- if (err) {
|- goto out_obj;
|- }
| switch ((*obj)->type) {
| case QTYPE_QDICT:
| visit_start_struct(v, name, NULL, 0, &err);
...
| }
|-out_obj:
|- visit_end_implicit_struct(v);
|+ visit_end_alternate(v);
| out:
| error_propagate(errp, err);
| }
Backports commit dbf11922622685934bfb41e7cf2be9bd4a0405c0 from qemu
2018-02-23 20:33:18 +00:00
|
|
|
static void qmp_input_start_alternate(Visitor *v, const char *name,
|
|
|
|
GenericAlternate **obj, size_t size,
|
|
|
|
bool promote_int, Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
QObject *qobj = qmp_input_get_object(qiv, name, false);
|
|
|
|
|
|
|
|
if (!qobj) {
|
qapi: Change visit_start_implicit_struct to visit_start_alternate
After recent changes, the only remaining use of
visit_start_implicit_struct() is for allocating the space needed
when visiting an alternate. Since the term 'implicit struct' is
hard to explain, rename the function to its current usage. While
at it, we can merge the functionality of visit_get_next_type()
into the same function, making it more like visit_start_struct().
Generated code is now slightly smaller:
| {
| Error *err = NULL;
|
|- visit_start_implicit_struct(v, (void**) obj, sizeof(BlockdevRef), &err);
|+ visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj),
|+ true, &err);
| if (err) {
| goto out;
| }
|- visit_get_next_type(v, name, &(*obj)->type, true, &err);
|- if (err) {
|- goto out_obj;
|- }
| switch ((*obj)->type) {
| case QTYPE_QDICT:
| visit_start_struct(v, name, NULL, 0, &err);
...
| }
|-out_obj:
|- visit_end_implicit_struct(v);
|+ visit_end_alternate(v);
| out:
| error_propagate(errp, err);
| }
Backports commit dbf11922622685934bfb41e7cf2be9bd4a0405c0 from qemu
2018-02-23 20:33:18 +00:00
|
|
|
*obj = NULL;
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
qapi: Change visit_start_implicit_struct to visit_start_alternate
After recent changes, the only remaining use of
visit_start_implicit_struct() is for allocating the space needed
when visiting an alternate. Since the term 'implicit struct' is
hard to explain, rename the function to its current usage. While
at it, we can merge the functionality of visit_get_next_type()
into the same function, making it more like visit_start_struct().
Generated code is now slightly smaller:
| {
| Error *err = NULL;
|
|- visit_start_implicit_struct(v, (void**) obj, sizeof(BlockdevRef), &err);
|+ visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj),
|+ true, &err);
| if (err) {
| goto out;
| }
|- visit_get_next_type(v, name, &(*obj)->type, true, &err);
|- if (err) {
|- goto out_obj;
|- }
| switch ((*obj)->type) {
| case QTYPE_QDICT:
| visit_start_struct(v, name, NULL, 0, &err);
...
| }
|-out_obj:
|- visit_end_implicit_struct(v);
|+ visit_end_alternate(v);
| out:
| error_propagate(errp, err);
| }
Backports commit dbf11922622685934bfb41e7cf2be9bd4a0405c0 from qemu
2018-02-23 20:33:18 +00:00
|
|
|
*obj = g_malloc0(size);
|
|
|
|
(*obj)->type = qobject_type(qobj);
|
|
|
|
if (promote_int && (*obj)->type == QTYPE_QINT) {
|
|
|
|
(*obj)->type = QTYPE_QFLOAT;
|
2018-02-20 02:57:23 +00:00
|
|
|
}
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_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.
Backports commit 4c40314a35816de635e7170eaacdc0c35be83a8a from qemu
2018-02-19 16:53:19 +00:00
|
|
|
Error **errp)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
2018-02-17 19:20:20 +00:00
|
|
|
QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-17 19:20:20 +00:00
|
|
|
if (!qint) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"integer");
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-17 19:20:20 +00:00
|
|
|
*obj = qint_get_int(qint);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_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.
Backports commit f755dea79dc81b0d6a8f6414e0672e165e28d8ba from qemu
2018-02-19 16:57:56 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
/* FIXME: qobject_to_qint mishandles values over INT64_MAX */
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj,
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
2018-02-17 19:15:06 +00:00
|
|
|
QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true));
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-17 19:15:06 +00:00
|
|
|
if (!qbool) {
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"boolean");
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-17 19:15:06 +00:00
|
|
|
*obj = qbool_get_bool(qbool);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
2018-02-17 19:23:15 +00:00
|
|
|
QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-17 19:23:15 +00:00
|
|
|
if (!qstr) {
|
2018-02-23 19:53:21 +00:00
|
|
|
*obj = NULL;
|
2018-02-13 22:34:32 +00:00
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"string");
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-17 19:23:15 +00:00
|
|
|
*obj = g_strdup(qstring_get_str(qstr));
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_type_number(Visitor *v, const char *name, double *obj,
|
2015-08-21 07:04:50 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
2018-02-17 19:20:20 +00:00
|
|
|
QInt *qint;
|
|
|
|
QFloat *qfloat;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-17 19:20:20 +00:00
|
|
|
qint = qobject_to_qint(qobj);
|
|
|
|
if (qint) {
|
|
|
|
*obj = qint_get_int(qobject_to_qint(qobj));
|
2015-08-21 07:04:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-02-17 19:20:20 +00:00
|
|
|
qfloat = qobject_to_qfloat(qobj);
|
|
|
|
if (qfloat) {
|
2015-08-21 07:04:50 +00:00
|
|
|
*obj = qfloat_get_double(qobject_to_qfloat(qobj));
|
2018-02-17 19:20:20 +00:00
|
|
|
return;
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
2018-02-17 19:20:20 +00:00
|
|
|
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"number");
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 04:28:33 +00:00
|
|
|
static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
|
2018-02-19 22:45:25 +00:00
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
|
|
|
|
|
|
qobject_incref(qobj);
|
|
|
|
*obj = qobj;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
static void qmp_input_type_null(Visitor *v, const char *name, Error **errp)
|
|
|
|
{
|
2018-02-24 00:02:11 +00:00
|
|
|
QmpInputVisitor *qiv = to_qiv(v);
|
|
|
|
QObject *qobj = qmp_input_get_object(qiv, name, true);
|
|
|
|
|
|
|
|
if (qobject_type(qobj) != QTYPE_QNULL) {
|
|
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
|
|
|
|
"null");
|
|
|
|
}
|
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-20 04:28:33 +00:00
|
|
|
static void qmp_input_optional(Visitor *v, const char *name, bool *present)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
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)
|
|
|
|
{
|
2018-02-23 20:16:40 +00:00
|
|
|
qobject_decref(v->root);
|
2016-12-21 14:28:36 +00:00
|
|
|
g_free(v);
|
2015-08-21 07:04:50 +00:00
|
|
|
}
|
|
|
|
|
2018-02-23 20:09:51 +00:00
|
|
|
QmpInputVisitor *qmp_input_visitor_new(QObject *obj, bool strict)
|
2015-08-21 07:04:50 +00:00
|
|
|
{
|
|
|
|
QmpInputVisitor *v;
|
|
|
|
|
|
|
|
v = g_malloc0(sizeof(*v));
|
|
|
|
|
2018-02-23 19:25:19 +00:00
|
|
|
v->visitor.type = VISITOR_INPUT;
|
2015-08-21 07:04:50 +00:00
|
|
|
v->visitor.start_struct = qmp_input_start_struct;
|
|
|
|
v->visitor.end_struct = qmp_input_end_struct;
|
qapi: Change visit_start_implicit_struct to visit_start_alternate
After recent changes, the only remaining use of
visit_start_implicit_struct() is for allocating the space needed
when visiting an alternate. Since the term 'implicit struct' is
hard to explain, rename the function to its current usage. While
at it, we can merge the functionality of visit_get_next_type()
into the same function, making it more like visit_start_struct().
Generated code is now slightly smaller:
| {
| Error *err = NULL;
|
|- visit_start_implicit_struct(v, (void**) obj, sizeof(BlockdevRef), &err);
|+ visit_start_alternate(v, name, (GenericAlternate **)obj, sizeof(**obj),
|+ true, &err);
| if (err) {
| goto out;
| }
|- visit_get_next_type(v, name, &(*obj)->type, true, &err);
|- if (err) {
|- goto out_obj;
|- }
| switch ((*obj)->type) {
| case QTYPE_QDICT:
| visit_start_struct(v, name, NULL, 0, &err);
...
| }
|-out_obj:
|- visit_end_implicit_struct(v);
|+ visit_end_alternate(v);
| out:
| error_propagate(errp, err);
| }
Backports commit dbf11922622685934bfb41e7cf2be9bd4a0405c0 from qemu
2018-02-23 20:33:18 +00:00
|
|
|
v->visitor.start_alternate = qmp_input_start_alternate;
|
2015-08-21 07:04:50 +00:00
|
|
|
v->visitor.start_list = qmp_input_start_list;
|
|
|
|
v->visitor.next_list = qmp_input_next_list;
|
|
|
|
v->visitor.end_list = qmp_input_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.
Backports commit 4c40314a35816de635e7170eaacdc0c35be83a8a from qemu
2018-02-19 16:53:19 +00:00
|
|
|
v->visitor.type_int64 = qmp_input_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.
Backports commit f755dea79dc81b0d6a8f6414e0672e165e28d8ba from qemu
2018-02-19 16:57:56 +00:00
|
|
|
v->visitor.type_uint64 = qmp_input_type_uint64;
|
2015-08-21 07:04:50 +00:00
|
|
|
v->visitor.type_bool = qmp_input_type_bool;
|
|
|
|
v->visitor.type_str = qmp_input_type_str;
|
|
|
|
v->visitor.type_number = qmp_input_type_number;
|
2018-02-19 22:45:25 +00:00
|
|
|
v->visitor.type_any = qmp_input_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.
Backports commit 3bc97fd5924561d92f32758c67eaffd2e4e25038 from qemu
2018-02-23 20:48:53 +00:00
|
|
|
v->visitor.type_null = qmp_input_type_null;
|
2015-08-21 07:04:50 +00:00
|
|
|
v->visitor.optional = qmp_input_optional;
|
2018-02-23 20:09:51 +00:00
|
|
|
v->strict = strict;
|
2015-08-21 07:04:50 +00:00
|
|
|
|
2018-02-23 20:16:40 +00:00
|
|
|
v->root = obj;
|
2015-08-21 07:04:50 +00:00
|
|
|
qobject_incref(obj);
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|