machine: Use type_init() to register machine classes

Change all machine_init() users that simply call type_register*()
to use type_init().

Cc: Evgeny Voevodin <e.voevodin@samsung.com>
Cc: Maksim Kozlov <m.kozlov@samsung.com>
Cc: Igor Mitsyanko <i.mitsyanko@gmail.com>
Cc: Dmitry Solodkiy <d.solodkiy@samsung.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Michael Walle <michael@walle.cc>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Acked-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 42faa8c48d2dffcf46afbd72f6e9625ec6805651..5b11cd9b4dffbdd13c315b9a081c276b2ab0fdd6 100644 (file)
--- 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 626d3383736a394a981c584f611bfba434dad776..d59d9ba4e469981c66c20fe5a1f676346fe5b10e 100644 (file)
--- 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 e25cf5e3f38943675d40970f1d11cf1617ca358b..e37378c69f4dd5f04c9a78a7bb02f3e420bec41c 100644 (file)
--- 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 d9e61f7779a595807c458f6d3e08fa9a9f5b5d8f..9a5f33bd8ae5fe54a5cfbeca05d5469099170493 100644 (file)
--- 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 68236a39b207b317c08ee3c9e180f6ca7d3a68be..cd50691d8bd14fd7085ab299db9e48302afb6dbe 100644 (file)
--- 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 90429fc456441e66ccbed167d0713395810b9dc5..481ae00fbc2c1af3b131cbe2fddf1d466e6d87b8 100644 (file)
--- 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 607cb58a2fcc1e05e3e9333dc3cfa38250507f79..c3048f3ea6f5070a8ffd48b5682ddcd787c678ea 100644 (file)
--- 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 de8dbb2a0fda7d81938ea67edf4f697a668a8951..c3c72f1b4912bb6340c2634fe5fe28ff1c1c1e29 100644 (file)
--- 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 d061f0fd073ed75d121dade2e01da188e9447556..5f7523e355963ef7a914c6fc985712fcef5d0c53 100644 (file)
--- 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 726c4e0c55db0550a652fec9b9843426e0015d47..769390c6c1a6b3810d77aa61b9babceed083f57c 100644 (file)
--- 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 8c3ac0d9521686500efbf62b77b872f031a2597c..95331a5662f1db55d1a6e0159d0fa8cf7bdf5b0c 100644 (file)
--- 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 c5a848b06cc317b3c6ce68a32febde34f5544a3d..5b61b76f2ed13d2dc42e42af366ba53c1742349c 100644 (file)
--- 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 d6d8058602ac29a88f446a5eb3e036fff8f5706d..4931cb1bf4c5d1fd609fb12b0918339ce1c029ed 100644 (file)
--- 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 67978083c63cca9a12405976dd55c26f6199236d..d8db3199c99ceae0abbf9591b6103def9f3be9bf 100644 (file)
--- 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 79a70a9c0fc381c8b0ac2b56d3071dd5de9e5560..d0bb42305bc9a17e347896694cdc7b9eedf10d4b 100644 (file)
--- 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 3d8c3c4fa8c625134edd72608be6c924ca64c063..4361c8a5dc691ec529ca69aaeb88eaa5cd5ca76b 100644 (file)
--- 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 eebef3789774f314376af1d5aa36428cdac314d5..613ca7e332e50f948d44698c79c17fb091b0db9a 100644 (file)
--- 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 0a6f4538587aa106e9f8295ce5bb94978ff1e362..54d200300ce7cf280eb956b67182e8059d1fd16a 100644 (file)
--- 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 ed09b9d80956a529f247ba0ac03c83f10e74ed34..54e7f46868c4a0cd16a15952d5681a67288c0f09 100644 (file)
--- 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 4b3fdbea9d74f499da9dbaf3cb578af37833182b..8efce0f91e0a833e30f37db83ad1ed243e7e75b2 100644 (file)
--- 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 8c2bf7fd676f67776cd5fa33320fa80d294b8d0e..847d92f5508308f6f2fa8672c2455a26babe6833 100644 (file)
--- 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