summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2018-04-19 17:01:42 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-05-04 08:27:53 +0200
commit3d3eacaeccaab718ea0e2ddaa578bfae9e311c59 (patch)
treee0f8f345f94f9de6b203da0e4a8ff06b23e4c5ae /tests
parent7ee9edfdb117da47c86c9764d90f0be11a648666 (diff)
downloadqemu-3d3eacaeccaab718ea0e2ddaa578bfae9e311c59.tar.gz
qobject: use a QObjectBase_ struct
By moving the base fields to a QObjectBase_, QObject can be a type which also has a 'base' field. This allows writing a generic QOBJECT() macro that will work with any QObject type, including QObject itself. The container_of() macro ensures that the object to cast has a QObjectBase_ base field, giving some type safety guarantees. QObject must have no members but QObjectBase_ base, or else QOBJECT() breaks. QObjectBase_ is not a typedef and uses a trailing underscore to make it obvious it is not for normal use and to avoid potential abuse. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180419150145.24795-3-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/check-qdict.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 08d4303e6a..07bb8f4564 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -570,11 +570,11 @@ static void qdict_join_test(void)
}
/* Check the references */
- g_assert(qdict_get(dict1, "foo")->refcnt == 1);
- g_assert(qdict_get(dict1, "bar")->refcnt == 1);
+ g_assert(qdict_get(dict1, "foo")->base.refcnt == 1);
+ g_assert(qdict_get(dict1, "bar")->base.refcnt == 1);
if (!overwrite) {
- g_assert(qdict_get(dict2, "foo")->refcnt == 1);
+ g_assert(qdict_get(dict2, "foo")->base.refcnt == 1);
}
/* Clean up */