From 1ed5b918ceda9a92dd00a2d432aa431bea2da66a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 3 Feb 2012 11:48:11 +0100 Subject: qom: clean up cast macros Reviewed-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- include/qemu/object.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/qemu/object.h b/include/qemu/object.h index 9d0251d56..ab1c48ca3 100644 --- a/include/qemu/object.h +++ b/include/qemu/object.h @@ -258,6 +258,16 @@ struct TypeInfo #define OBJECT(obj) \ ((Object *)(obj)) +/** + * OBJECT_CLASS: + * @class: A derivative of #ObjectClas. + * + * Converts a class to an #ObjectClass. Since all objects are #Objects, + * this function will always succeed. + */ +#define OBJECT_CLASS(class) \ + ((ObjectClass *)(class)) + /** * OBJECT_CHECK: * @type: The C type to use for the return value. @@ -272,7 +282,7 @@ struct TypeInfo * generated. */ #define OBJECT_CHECK(type, obj, name) \ - ((type *)object_dynamic_cast_assert((Object *)(obj), (name))) + ((type *)object_dynamic_cast_assert(OBJECT(obj), (name))) /** * OBJECT_CLASS_CHECK: @@ -280,11 +290,12 @@ struct TypeInfo * @obj: A derivative of @type to cast. * @name: the QOM typename of @class. * - * A type safe version of @object_check_class. This macro is typically wrapped - * by each type to perform type safe casts of a class to a specific class type. + * A type safe version of @object_class_dynamic_cast_assert. This macro is + * typically wrapped by each type to perform type safe casts of a class to a + * specific class type. */ #define OBJECT_CLASS_CHECK(class, obj, name) \ - ((class *)object_class_dynamic_cast_assert((ObjectClass *)(obj), (name))) + ((class *)object_class_dynamic_cast_assert(OBJECT_CLASS(obj), (name))) /** * OBJECT_GET_CLASS: @@ -299,9 +310,6 @@ struct TypeInfo #define OBJECT_GET_CLASS(class, obj, name) \ OBJECT_CLASS_CHECK(class, object_get_class(OBJECT(obj)), name) -#define OBJECT_CLASS(class) \ - ((ObjectClass *)(class)) - /** * InterfaceClass: * @parent_class: the base class -- cgit v1.2.3