summaryrefslogtreecommitdiff
path: root/include/qapi
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2018-04-19 17:01:41 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-05-04 08:27:53 +0200
commit7ee9edfdb117da47c86c9764d90f0be11a648666 (patch)
tree76e597b01b87fa5c6707e6f6410cb347fefbb0b3 /include/qapi
parent46cfbf13b06d551072ed17fbfca67c103edf814f (diff)
downloadqemu-7ee9edfdb117da47c86c9764d90f0be11a648666.tar.gz
qobject: Ensure base is at offset 0
All QObject types have the base QObject as their first field. This allows the simplification of qobject_to(). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180419150145.24795-2-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Commit message paragraph on type casts dropped, to avoid giving the impression type casting would be okay] Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'include/qapi')
-rw-r--r--include/qapi/qmp/qobject.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h
index e022707578..5206ff9ee1 100644
--- a/include/qapi/qmp/qobject.h
+++ b/include/qapi/qmp/qobject.h
@@ -61,9 +61,8 @@ struct QObject {
QEMU_BUILD_BUG_MSG(QTYPE__MAX != 7,
"The QTYPE_CAST_TO_* list needs to be extended");
-#define qobject_to(type, obj) ({ \
- QObject *_tmp = qobject_check_type(obj, glue(QTYPE_CAST_TO_, type)); \
- _tmp ? container_of(_tmp, type, base) : (type *)NULL; })
+#define qobject_to(type, obj) \
+ ((type *)qobject_check_type(obj, glue(QTYPE_CAST_TO_, type)))
/* Initialize an object to default values */
static inline void qobject_init(QObject *obj, QType type)