summaryrefslogtreecommitdiff
path: root/hw/cirrus_vga.c
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 /hw/cirrus_vga.c
parent59f971d451fbabee3194bb565f40846398ee6e6f (diff)
downloadqemu-83f7d43a9ef70b1b91e465173e18c845420e931e.tar.gz
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 'hw/cirrus_vga.c')
-rw-r--r--hw/cirrus_vga.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index a8e8ab7660..4edcb94774 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2923,12 +2923,6 @@ static TypeInfo isa_cirrus_vga_info = {
.class_init = isa_cirrus_vga_class_init,
};
-static void isa_cirrus_vga_register(void)
-{
- type_register_static(&isa_cirrus_vga_info);
-}
-device_init(isa_cirrus_vga_register)
-
/***************************************
*
* PCI bus support
@@ -2996,8 +2990,10 @@ static TypeInfo cirrus_vga_info = {
.class_init = cirrus_vga_class_init,
};
-static void cirrus_vga_register(void)
+static void cirrus_vga_register_types(void)
{
+ type_register_static(&isa_cirrus_vga_info);
type_register_static(&cirrus_vga_info);
}
-device_init(cirrus_vga_register);
+
+type_init(cirrus_vga_register_types)