15280c360e
The macro expansions of qdict_put_TYPE() and qlist_append_TYPE() need qbool.h, qnull.h, qnum.h and qstring.h to compile. We include qnull.h and qnum.h in the headers, but not qbool.h and qstring.h. Works, because we include those wherever the macros get used. Open-coding these helpers is of dubious value. Turn them into functions and drop the includes from the headers. This cleanup makes the number of objects depending on qapi/qmp/qnum.h from 4551 (out of 4743) to 46 in my "build everything" tree. For qapi/qmp/qnull.h, the number drops from 4552 to 21. Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180201111846.21846-10-armbru@redhat.com>
88 lines
2.2 KiB
C
88 lines
2.2 KiB
C
/*
|
|
* QLit literal qobject
|
|
*
|
|
* Copyright IBM, Corp. 2009
|
|
* Copyright (c) 2013, 2015, 2017 Red Hat Inc.
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
* Markus Armbruster <armbru@redhat.com>
|
|
* Marc-André Lureau <marcandre.lureau@redhat.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.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "qapi/qmp/qlit.h"
|
|
#include "qapi/qmp/qbool.h"
|
|
#include "qapi/qmp/qnum.h"
|
|
#include "qapi/qmp/qdict.h"
|
|
#include "qapi/qmp/qstring.h"
|
|
|
|
static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; lhs->value.qdict[i].key; i++) {
|
|
QObject *obj = qdict_get(qdict, lhs->value.qdict[i].key);
|
|
|
|
if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/* Note: the literal qdict must not contain duplicates, this is
|
|
* considered a programming error and it isn't checked here. */
|
|
if (qdict_size(qdict) != i) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static bool qlit_equal_qlist(const QLitObject *lhs, const QList *qlist)
|
|
{
|
|
QListEntry *e;
|
|
int i = 0;
|
|
|
|
QLIST_FOREACH_ENTRY(qlist, e) {
|
|
QObject *obj = qlist_entry_obj(e);
|
|
|
|
if (!qlit_equal_qobject(&lhs->value.qlist[i], obj)) {
|
|
return false;
|
|
}
|
|
i++;
|
|
}
|
|
|
|
return !e && lhs->value.qlist[i].type == QTYPE_NONE;
|
|
}
|
|
|
|
bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)
|
|
{
|
|
if (!rhs || lhs->type != qobject_type(rhs)) {
|
|
return false;
|
|
}
|
|
|
|
switch (lhs->type) {
|
|
case QTYPE_QBOOL:
|
|
return lhs->value.qbool == qbool_get_bool(qobject_to_qbool(rhs));
|
|
case QTYPE_QNUM:
|
|
return lhs->value.qnum == qnum_get_int(qobject_to_qnum(rhs));
|
|
case QTYPE_QSTRING:
|
|
return (strcmp(lhs->value.qstr,
|
|
qstring_get_str(qobject_to_qstring(rhs))) == 0);
|
|
case QTYPE_QDICT:
|
|
return qlit_equal_qdict(lhs, qobject_to_qdict(rhs));
|
|
case QTYPE_QLIST:
|
|
return qlit_equal_qlist(lhs, qobject_to_qlist(rhs));
|
|
case QTYPE_QNULL:
|
|
return true;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return false;
|
|
}
|