motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Separate type QNull from QObject

Browse source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2017-06-26 13:52:24 +02:00
parent df95f1a298
commit 006ca09f30
7 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/check-qjson.c
View file

@ -1012,7 +1012,7 @@ static void keyword_literal(void)
{
QObject *obj;
QBool *qbool;
QObject *null;
QNull *null;
QString *str;
obj = qobject_from_json("true", &error_abort);
@ -1053,10 +1053,10 @@ static void keyword_literal(void)
g_assert(qobject_type(obj) == QTYPE_QNULL);
null = qnull();
g_assert(null == obj);
g_assert(QOBJECT(null) == obj);
qobject_decref(obj);
qobject_decref(null);
QDECREF(null);
}
typedef struct LiteralQDictEntry LiteralQDictEntry;

18
tests/check-qnull.c
View file

@ -24,14 +24,14 @@ static void qnull_ref_test(void)
{
QObject *obj;
g_assert(qnull_.refcnt == 1);
obj = qnull();
g_assert(qnull_.base.refcnt == 1);
obj = QOBJECT(qnull());
g_assert(obj);
g_assert(obj == &qnull_);
g_assert(qnull_.refcnt == 2);
g_assert(obj == QOBJECT(&qnull_));
g_assert(qnull_.base.refcnt == 2);
g_assert(qobject_type(obj) == QTYPE_QNULL);
qobject_decref(obj);
g_assert(qnull_.refcnt == 1);
g_assert(qnull_.base.refcnt == 1);
}
static void qnull_visit_test(void)
@ -45,8 +45,8 @@ static void qnull_visit_test(void)
* depend on layering violations to check qnull_ refcnt.
*/
g_assert(qnull_.refcnt == 1);
obj = qnull();
g_assert(qnull_.base.refcnt == 1);
obj = QOBJECT(qnull());
v = qobject_input_visitor_new(obj);
qobject_decref(obj);
visit_type_null(v, NULL, &error_abort);
@ -55,11 +55,11 @@ static void qnull_visit_test(void)
v = qobject_output_visitor_new(&obj);
visit_type_null(v, NULL, &error_abort);
visit_complete(v, &obj);
g_assert(obj == &qnull_);
g_assert(obj == QOBJECT(&qnull_));
qobject_decref(obj);
visit_free(v);
g_assert(qnull_.refcnt == 1);
g_assert(qnull_.base.refcnt == 1);
}
int main(int argc, char **argv)