Many QOM types don't follow the Type/TypeClass pattern
on the instance/struct names. Let the class struct name
be specified in the OBJECT_DECLARE* macros.
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Message-Id: <20200831210740.126168-4-ehabk...@redhat.com>
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
include/qom/object.h | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index f515230f61..500e7dfa99 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -555,7 +555,8 @@ struct Object
/**
* OBJECT_DECLARE_TYPE:
- * @ModuleObjName: the object name with initial capitalization
+ * @InstanceType: instance struct name
+ * @ClassType: class struct name
* @module_obj_name: the object name in lowercase with underscore separators
* @MODULE_OBJ_NAME: the object name in uppercase with underscore separators
*
@@ -567,33 +568,33 @@ struct Object
*
* The object struct and class struct need to be declared manually.
*/
-#define OBJECT_DECLARE_TYPE(ModuleObjName, module_obj_name, MODULE_OBJ_NAME) \
- typedef struct ModuleObjName ModuleObjName; \
- typedef struct ModuleObjName##Class ModuleObjName##Class; \
+#define OBJECT_DECLARE_TYPE(InstanceType, ClassType, module_obj_name,
MODULE_OBJ_NAME) \
+ typedef struct InstanceType InstanceType; \
+ typedef struct ClassType ClassType; \
\
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(ModuleObjName, object_unref) \
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(InstanceType, object_unref) \
\
- static inline G_GNUC_UNUSED ModuleObjName##Class * \
+ static inline G_GNUC_UNUSED ClassType * \
MODULE_OBJ_NAME##_GET_CLASS(void *obj) \
- { return OBJECT_GET_CLASS(ModuleObjName##Class, obj, \
+ { return OBJECT_GET_CLASS(ClassType, obj, \
TYPE_##MODULE_OBJ_NAME); } \
\
- static inline G_GNUC_UNUSED ModuleObjName##Class * \
+ static inline G_GNUC_UNUSED ClassType * \
MODULE_OBJ_NAME##_CLASS(void *klass) \
- { return OBJECT_CLASS_CHECK(ModuleObjName##Class, klass, \
+ { return OBJECT_CLASS_CHECK(ClassType, klass, \
TYPE_##MODULE_OBJ_NAME); } \
\
- static inline G_GNUC_UNUSED ModuleObjName * \
+ static inline G_GNUC_UNUSED InstanceType * \
MODULE_OBJ_NAME(void *obj) \
- { return OBJECT_CHECK(ModuleObjName, obj, \
+ { return OBJECT_CHECK(InstanceType, obj, \
TYPE_##MODULE_OBJ_NAME); }
/**
* OBJECT_DECLARE_SIMPLE_TYPE:
- * @ModuleObjName: the object name with initial caps
+ * @InstanceType: instance struct name
* @module_obj_name: the object name in lowercase with underscore separators
* @MODULE_OBJ_NAME: the object name in uppercase with underscore separators
- * @ParentModuleObjName: the parent object name with initial caps
+ * @ParentClassType: class struct name of parent type
*
* This does the same as OBJECT_DECLARE_TYPE(), but also declares
* the class struct, thus only the object struct needs to be declare
@@ -602,10 +603,10 @@ struct Object
* This macro should be used unless the class struct needs to have
* virtual methods declared.
*/
-#define OBJECT_DECLARE_SIMPLE_TYPE(ModuleObjName, module_obj_name, \
- MODULE_OBJ_NAME, ParentModuleObjName) \
- OBJECT_DECLARE_TYPE(ModuleObjName, module_obj_name, MODULE_OBJ_NAME) \
- struct ModuleObjName##Class { ParentModuleObjName##Class parent_class; };
+#define OBJECT_DECLARE_SIMPLE_TYPE(InstanceType, module_obj_name, \
+ MODULE_OBJ_NAME, ParentClassType) \
+ OBJECT_DECLARE_TYPE(InstanceType, InstanceType##Class, module_obj_name,
MODULE_OBJ_NAME) \
+ struct InstanceType##Class { ParentClassType parent_class; };
/**
--
2.26.2
