summaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-07-07 17:53:17 +0200
committerMarkus Armbruster <armbru@redhat.com>2016-07-19 13:21:08 +0200
commitfc76ae8b38783e82c109834573ba5d6f080440b5 (patch)
tree93bc68e09d921dfe6ab161e98ded37565f417a07 /qapi
parent0c1b58f25025cc09463aae235162b19ff45c37b7 (diff)
downloadqemu-fc76ae8b38783e82c109834573ba5d6f080440b5.tar.gz
qapi: change QmpOutputVisitor to QSLIST
This saves a little memory compared to the doubly-linked QTAILQ. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1467906798-5312-2-git-send-email-pbonzini@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> [Comment tweaked to avoid long line] Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/qmp-output-visitor.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 0452056d42..9e3b67ce13 100644
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -23,15 +23,13 @@ typedef struct QStackEntry
{
QObject *value;
void *qapi; /* sanity check that caller uses same pointer */
- QTAILQ_ENTRY(QStackEntry) node;
+ QSLIST_ENTRY(QStackEntry) node;
} QStackEntry;
-typedef QTAILQ_HEAD(QStack, QStackEntry) QStack;
-
struct QmpOutputVisitor
{
Visitor visitor;
- QStack stack; /* Stack of containers that haven't yet been finished */
+ QSLIST_HEAD(, QStackEntry) stack; /* Stack of unfinished containers */
QObject *root; /* Root of the output visit */
QObject **result; /* User's storage location for result */
};
@@ -56,18 +54,18 @@ static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value,
assert(value);
e->value = value;
e->qapi = qapi;
- QTAILQ_INSERT_HEAD(&qov->stack, e, node);
+ QSLIST_INSERT_HEAD(&qov->stack, e, node);
}
/* Pop a value off the stack of QObjects being built, and return it. */
static QObject *qmp_output_pop(QmpOutputVisitor *qov, void *qapi)
{
- QStackEntry *e = QTAILQ_FIRST(&qov->stack);
+ QStackEntry *e = QSLIST_FIRST(&qov->stack);
QObject *value;
assert(e);
assert(e->qapi == qapi);
- QTAILQ_REMOVE(&qov->stack, e, node);
+ QSLIST_REMOVE_HEAD(&qov->stack, node);
value = e->value;
assert(value);
g_free(e);
@@ -80,7 +78,7 @@ static QObject *qmp_output_pop(QmpOutputVisitor *qov, void *qapi)
static void qmp_output_add_obj(QmpOutputVisitor *qov, const char *name,
QObject *value)
{
- QStackEntry *e = QTAILQ_FIRST(&qov->stack);
+ QStackEntry *e = QSLIST_FIRST(&qov->stack);
QObject *cur = e ? e->value : NULL;
if (!cur) {
@@ -206,7 +204,7 @@ static void qmp_output_complete(Visitor *v, void *opaque)
QmpOutputVisitor *qov = to_qov(v);
/* A visit must have occurred, with each start paired with end. */
- assert(qov->root && QTAILQ_EMPTY(&qov->stack));
+ assert(qov->root && QSLIST_EMPTY(&qov->stack));
assert(opaque == qov->result);
qobject_incref(qov->root);
@@ -217,10 +215,11 @@ static void qmp_output_complete(Visitor *v, void *opaque)
static void qmp_output_free(Visitor *v)
{
QmpOutputVisitor *qov = to_qov(v);
- QStackEntry *e, *tmp;
+ QStackEntry *e;
- QTAILQ_FOREACH_SAFE(e, &qov->stack, node, tmp) {
- QTAILQ_REMOVE(&qov->stack, e, node);
+ while (!QSLIST_EMPTY(&qov->stack)) {
+ e = QSLIST_FIRST(&qov->stack);
+ QSLIST_REMOVE_HEAD(&qov->stack, node);
g_free(e);
}
@@ -250,7 +249,6 @@ Visitor *qmp_output_visitor_new(QObject **result)
v->visitor.complete = qmp_output_complete;
v->visitor.free = qmp_output_free;
- QTAILQ_INIT(&v->stack);
*result = NULL;
v->result = result;