@@ -180,4 +180,4 @@ static void exynos4_machines_init(void)
type_register_static(&smdkc210_type);
}
-machine_init(exynos4_machines_init)
+type_init(exynos4_machines_init)
@@ -155,4 +155,4 @@ static void gumstix_machine_init(void)
type_register_static(&verdex_type);
}
-machine_init(gumstix_machine_init)
+type_init(gumstix_machine_init)
@@ -429,4 +429,4 @@ static void calxeda_machines_init(void)
type_register_static(&midway_type);
}
-machine_init(calxeda_machines_init)
+type_init(calxeda_machines_init)
@@ -1449,4 +1449,4 @@ static void nseries_machine_init(void)
type_register_static(&n810_type);
}
-machine_init(nseries_machine_init)
+type_init(nseries_machine_init)
@@ -251,4 +251,4 @@ static void sx1_machine_init(void)
type_register_static(&sx1_machine_v2_type);
}
-machine_init(sx1_machine_init)
+type_init(sx1_machine_init)
@@ -468,4 +468,4 @@ static void realview_machine_init(void)
type_register_static(&realview_pbx_a9_type);
}
-machine_init(realview_machine_init)
+type_init(realview_machine_init)
@@ -1028,16 +1028,6 @@ static const TypeInfo terrierpda_type = {
.class_init = terrierpda_class_init,
};
-static void spitz_machine_init(void)
-{
- type_register_static(&akitapda_type);
- type_register_static(&spitzpda_type);
- type_register_static(&borzoipda_type);
- type_register_static(&terrierpda_type);
-}
-
-machine_init(spitz_machine_init)
-
static bool is_version_0(void *opaque, int version_id)
{
return version_id == 0;
@@ -1167,6 +1157,11 @@ static const TypeInfo spitz_lcdtg_info = {
static void spitz_register_types(void)
{
+ type_register_static(&akitapda_type);
+ type_register_static(&spitzpda_type);
+ type_register_static(&borzoipda_type);
+ type_register_static(&terrierpda_type);
+
type_register_static(&corgi_ssp_info);
type_register_static(&spitz_lcdtg_info);
type_register_static(&spitz_keyboard_info);
@@ -1394,14 +1394,6 @@ static const TypeInfo lm3s6965evb_type = {
.class_init = lm3s6965evb_class_init,
};
-static void stellaris_machine_init(void)
-{
- type_register_static(&lm3s811evb_type);
- type_register_static(&lm3s6965evb_type);
-}
-
-machine_init(stellaris_machine_init)
-
static void stellaris_i2c_class_init(ObjectClass *klass, void *data)
{
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
@@ -1446,6 +1438,9 @@ static const TypeInfo stellaris_adc_info = {
static void stellaris_register_types(void)
{
+ type_register_static(&lm3s811evb_type);
+ type_register_static(&lm3s6965evb_type);
+
type_register_static(&stellaris_i2c_info);
type_register_static(&stellaris_gptm_info);
type_register_static(&stellaris_adc_info);
@@ -421,14 +421,6 @@ static const TypeInfo versatileab_type = {
.class_init = versatileab_class_init,
};
-static void versatile_machine_init(void)
-{
- type_register_static(&versatilepb_type);
- type_register_static(&versatileab_type);
-}
-
-machine_init(versatile_machine_init)
-
static void vpb_sic_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -447,6 +439,9 @@ static const TypeInfo vpb_sic_info = {
static void versatilepb_register_types(void)
{
+ type_register_static(&versatilepb_type);
+ type_register_static(&versatileab_type);
+
type_register_static(&vpb_sic_info);
}
@@ -802,4 +802,4 @@ static void vexpress_machine_init(void)
type_register_static(&vexpress_a15_info);
}
-machine_init(vexpress_machine_init);
+type_init(vexpress_machine_init)
@@ -1095,4 +1095,4 @@ static void machvirt_machine_init(void)
type_register_static(&machvirt_info);
}
-machine_init(machvirt_machine_init);
+type_init(machvirt_machine_init);
@@ -328,4 +328,4 @@ static void lm32_machine_init(void)
type_register_static(&lm32_uclinux_type);
}
-machine_init(lm32_machine_init)
+type_init(lm32_machine_init)
@@ -385,4 +385,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)
@@ -693,4 +693,4 @@ static void ppc405_machine_init(void)
type_register_static(&taihu_type);
}
-machine_init(ppc405_machine_init)
+type_init(ppc405_machine_init)
@@ -1570,14 +1570,6 @@ static const TypeInfo sbook_type = {
static void sun4m_register_types(void)
{
- type_register_static(&idreg_info);
- 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);
@@ -1587,7 +1579,11 @@ static void sun4m_machine_init(void)
type_register_static(&ss4_type);
type_register_static(&scls_type);
type_register_static(&sbook_type);
+
+ type_register_static(&idreg_info);
+ type_register_static(&afx_info);
+ type_register_static(&prom_info);
+ type_register_static(&ram_info);
}
type_init(sun4m_register_types)
-machine_init(sun4m_machine_init)
@@ -1016,17 +1016,13 @@ static const TypeInfo niagara_type = {
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_register_static(&ebus_info);
+ type_register_static(&prom_info);
+ type_register_static(&ram_info);
}
type_init(sun4u_register_types)
-machine_init(sun4u_machine_init)
@@ -496,4 +496,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)
@@ -147,6 +147,6 @@ struct MachineState {
{ \
type_register_static(&machine_initfn##_typeinfo); \
} \
- machine_init(machine_initfn##_register_types)
+ type_init(machine_initfn##_register_types)
#endif
@@ -717,7 +717,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)
#define SET_MACHINE_COMPAT(m, COMPAT) do { \
static GlobalProperty props[] = { \
This prepares for dropping machine_init(), now that QEMUMachine is gone. Signed-off-by: Andreas Färber <afaerber@suse.de> --- 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 | 15 +++++---------- hw/arm/stellaris.c | 11 +++-------- hw/arm/versatilepb.c | 11 +++-------- 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/sparc/sun4m.c | 14 +++++--------- hw/sparc64/sun4u.c | 12 ++++-------- hw/xtensa/xtfpga.c | 2 +- include/hw/boards.h | 2 +- include/hw/i386/pc.h | 2 +- 19 files changed, 34 insertions(+), 57 deletions(-)