aboutsummaryrefslogtreecommitdiff
path: root/module.h
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-02-09 15:20:55 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-15 09:39:21 -0600
commit83f7d43a9ef70b1b91e465173e18c845420e931e (patch)
treec34cbc9d6f7986f2d643a9e7077a519386dbb55a /module.h
parent59f971d451fbabee3194bb565f40846398ee6e6f (diff)
qom: Unify type registration
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 <afaerber@suse.de> Cc: Anthony Liguori <anthony@codemonkey.ws> Cc: malc <av1474@comtv.ru> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'module.h')
-rw-r--r--module.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/module.h b/module.h
index ef667304c4..c4ccd57166 100644
--- a/module.h
+++ b/module.h
@@ -22,16 +22,16 @@ static void __attribute__((constructor)) do_qemu_init_ ## function(void) { \
typedef enum {
MODULE_INIT_BLOCK,
- MODULE_INIT_DEVICE,
MODULE_INIT_MACHINE,
MODULE_INIT_QAPI,
+ MODULE_INIT_QOM,
MODULE_INIT_MAX
} module_init_type;
#define block_init(function) module_init(function, MODULE_INIT_BLOCK)
-#define device_init(function) module_init(function, MODULE_INIT_DEVICE)
#define machine_init(function) module_init(function, MODULE_INIT_MACHINE)
#define qapi_init(function) module_init(function, MODULE_INIT_QAPI)
+#define type_init(function) module_init(function, MODULE_INIT_QOM)
void register_module_init(void (*fn)(void), module_init_type type);