From 83f7d43a9ef70b1b91e465173e18c845420e931e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 9 Feb 2012 15:20:55 +0100 Subject: qom: Unify type registration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace device_init() with generalized type_init(). While at it, unify naming convention: type_init([$prefix_]register_types) Also, type_init() is a function, so add preceding blank line where necessary and don't put a semicolon after the closing brace. Signed-off-by: Andreas Färber Cc: Anthony Liguori Cc: malc Signed-off-by: Anthony Liguori --- qom/container.c | 4 ++-- qom/object.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qom') diff --git a/qom/container.c b/qom/container.c index 946cbff..f107208 100644 --- a/qom/container.c +++ b/qom/container.c @@ -19,9 +19,9 @@ static TypeInfo container_info = { .parent = TYPE_OBJECT, }; -static void container_init(void) +static void container_register_types(void) { type_register_static(&container_info); } -device_init(container_init); +type_init(container_register_types) diff --git a/qom/object.c b/qom/object.c index 5e5b261..0cbd9bb 100644 --- a/qom/object.c +++ b/qom/object.c @@ -444,7 +444,7 @@ Object *object_dynamic_cast(Object *obj, const char *typename) } -static void register_interface(void) +static void register_types(void) { static TypeInfo interface_info = { .name = TYPE_INTERFACE, @@ -455,7 +455,7 @@ static void register_interface(void) type_interface = type_register_static(&interface_info); } -device_init(register_interface); +type_init(register_types) Object *object_dynamic_cast_assert(Object *obj, const char *typename) { -- cgit v1.1