From 0e6aac87fd0f5db2be57c36c03d67388577208a7 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Tue, 16 Feb 2016 18:59:04 -0200 Subject: [PATCH] machine: Use type_init() to register machine classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change all machine_init() users that simply call type_register*() to use type_init(). Cc: Evgeny Voevodin Cc: Maksim Kozlov Cc: Igor Mitsyanko Cc: Dmitry Solodkiy Cc: Peter Maydell Cc: Rob Herring Cc: Andrzej Zaborowski Cc: Michael Walle Cc: "Hervé Poussineau" Cc: Aurelien Jarno Cc: Leon Alrae Cc: Alexander Graf Cc: David Gibson Cc: Blue Swirl Cc: Mark Cave-Ayland Cc: Max Filippov Cc: "Michael S. Tsirkin" Acked-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Acked-by: David Gibson Signed-off-by: Eduardo Habkost --- hw/arm/exynos4_boards.c | 2 +- hw/arm/gumstix.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/nseries.c | 2 +- hw/arm/omap_sx1.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/lm32/lm32_boards.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/ppc/ppc405_boards.c | 2 +- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- hw/sparc/sun4m.c | 4 ---- hw/sparc64/sun4u.c | 4 ---- hw/xtensa/xtfpga.c | 2 +- include/hw/boards.h | 2 +- include/hw/i386/pc.h | 2 +- 21 files changed, 19 insertions(+), 27 deletions(-) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 42faa8c48d..5b11cd9b4d 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -181,4 +181,4 @@ static void exynos4_machines_init(void) type_register_static(&smdkc210_type); } -machine_init(exynos4_machines_init) +type_init(exynos4_machines_init) diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 626d338373..d59d9ba4e4 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -156,4 +156,4 @@ static void gumstix_machine_init(void) type_register_static(&verdex_type); } -machine_init(gumstix_machine_init) +type_init(gumstix_machine_init) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index e25cf5e3f3..e37378c69f 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -437,4 +437,4 @@ static void calxeda_machines_init(void) type_register_static(&midway_type); } -machine_init(calxeda_machines_init) +type_init(calxeda_machines_init) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index d9e61f7779..9a5f33bd8a 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1450,4 +1450,4 @@ static void nseries_machine_init(void) type_register_static(&n810_type); } -machine_init(nseries_machine_init) +type_init(nseries_machine_init) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 68236a39b2..cd50691d8b 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -252,4 +252,4 @@ static void sx1_machine_init(void) type_register_static(&sx1_machine_v2_type); } -machine_init(sx1_machine_init) +type_init(sx1_machine_init) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 90429fc456..481ae00fbc 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -457,4 +457,4 @@ static void realview_machine_init(void) type_register_static(&realview_pbx_a9_type); } -machine_init(realview_machine_init) +type_init(realview_machine_init) diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 607cb58a2f..c3048f3ea6 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -1037,7 +1037,7 @@ static void spitz_machine_init(void) type_register_static(&terrierpda_type); } -machine_init(spitz_machine_init) +type_init(spitz_machine_init) static bool is_version_0(void *opaque, int version_id) { diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index de8dbb2a0f..c3c72f1b49 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1420,7 +1420,7 @@ static void stellaris_machine_init(void) type_register_static(&lm3s6965evb_type); } -machine_init(stellaris_machine_init) +type_init(stellaris_machine_init) static void stellaris_i2c_class_init(ObjectClass *klass, void *data) { diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index d061f0fd07..5f7523e355 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -419,7 +419,7 @@ static void versatile_machine_init(void) type_register_static(&versatileab_type); } -machine_init(versatile_machine_init) +type_init(versatile_machine_init) static void vpb_sic_class_init(ObjectClass *klass, void *data) { diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 726c4e0c55..769390c6c1 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -800,4 +800,4 @@ static void vexpress_machine_init(void) type_register_static(&vexpress_a15_info); } -machine_init(vexpress_machine_init); +type_init(vexpress_machine_init); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 8c3ac0d952..95331a5662 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1428,4 +1428,4 @@ static void machvirt_machine_init(void) type_register_static(&machvirt_info); } -machine_init(machvirt_machine_init); +type_init(machvirt_machine_init); diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index c5a848b06c..5b61b76f2e 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -329,4 +329,4 @@ static void lm32_machine_init(void) type_register_static(&lm32_uclinux_type); } -machine_init(lm32_machine_init) +type_init(lm32_machine_init) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index d6d8058602..4931cb1bf4 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -387,4 +387,4 @@ static void mips_jazz_machine_init(void) type_register_static(&mips_pica61_type); } -machine_init(mips_jazz_machine_init) +type_init(mips_jazz_machine_init) diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 67978083c6..d8db3199c9 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -658,4 +658,4 @@ static void ppc405_machine_init(void) type_register_static(&taihu_type); } -machine_init(ppc405_machine_init) +type_init(ppc405_machine_init) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 79a70a9c0f..d0bb42305b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2342,7 +2342,7 @@ static const TypeInfo spapr_machine_info = { { \ type_register(&spapr_machine_##suffix##_info); \ } \ - machine_init(spapr_machine_register_##suffix) + type_init(spapr_machine_register_##suffix) /* * pseries-2.6 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 3d8c3c4fa8..4361c8a5dc 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -294,7 +294,7 @@ static const TypeInfo ccw_machine_info = { { \ type_register_static(&ccw_machine_##suffix##_info); \ } \ - machine_init(ccw_machine_register_##suffix) + type_init(ccw_machine_register_##suffix) #define CCW_COMPAT_2_5 \ HW_COMPAT_2_5 diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index eebef37897..613ca7e332 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1553,10 +1553,7 @@ static void sun4m_register_types(void) type_register_static(&afx_info); type_register_static(&prom_info); type_register_static(&ram_info); -} -static void sun4m_machine_init(void) -{ type_register_static(&ss5_type); type_register_static(&ss10_type); type_register_static(&ss600mp_type); @@ -1569,4 +1566,3 @@ static void sun4m_machine_init(void) } type_init(sun4m_register_types) -machine_init(sun4m_machine_init) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 0a6f453858..54d200300c 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -997,14 +997,10 @@ static void sun4u_register_types(void) type_register_static(&ebus_info); type_register_static(&prom_info); type_register_static(&ram_info); -} -static void sun4u_machine_init(void) -{ type_register_static(&sun4u_type); type_register_static(&sun4v_type); type_register_static(&niagara_type); } type_init(sun4u_register_types) -machine_init(sun4u_machine_init) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index ed09b9d809..54e7f46868 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -510,4 +510,4 @@ static void xtensa_lx_machines_init(void) type_register_static(&xtensa_kc705_type); } -machine_init(xtensa_lx_machines_init) +type_init(xtensa_lx_machines_init) diff --git a/include/hw/boards.h b/include/hw/boards.h index 4b3fdbea9d..8efce0f91e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -181,7 +181,7 @@ struct MachineState { { \ type_register_static(&machine_initfn##_typeinfo); \ } \ - machine_init(machine_initfn##_register_types) + type_init(machine_initfn##_register_types) #define SET_MACHINE_COMPAT(m, COMPAT) \ do { \ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 8c2bf7fd67..847d92f550 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -858,7 +858,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); { \ type_register(&pc_machine_type_##suffix); \ } \ - machine_init(pc_machine_init_##suffix) + type_init(pc_machine_init_##suffix) extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id); #endif