Re: [Qemu-devel] [PATCH 1/4] machine: Use type_init() to register machine classes
On Tue, Feb 16, 2016 at 06:59:04PM -0200, Eduardo Habkost wrote: > 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" > 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/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 +- > 20 files changed, 18 insertions(+), 26 deletions(-) For spapr, Acked-by: David Gibson -- David Gibson| I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson signature.asc Description: PGP signature
Re: [Qemu-devel] [PATCH 1/4] machine: Use type_init() to register machine classes
On Tue, Feb 16, 2016 at 06:59:04PM -0200, Eduardo Habkost wrote:
> 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"
> Signed-off-by: Eduardo Habkost
For pc:
Reviewed-by: Michael S. Tsirkin
> ---
> 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/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 +-
> 20 files changed, 18 insertions(+), 26 deletions(-)
>
> diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
> index 42faa8c..5b11cd9 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 626d338..d59d9ba 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 e25cf5e..e37378c 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 d9e61f7..9a5f33b 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 68236a3..cd50691 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 90429fc..481ae00 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 607cb58..c3048f3 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 de8dbb2..c3c72f1 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 d061f0f..5f7523e 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 3154aea..9eca64c 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -798,4 +798,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 44bbbea..69eef0b 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt
Re: [Qemu-devel] [PATCH 1/4] machine: Use type_init() to register machine classes
On 02/16/2016 10:59 PM, Eduardo Habkost wrote:
Change all machine_init() users that simply call type_register*()
to use type_init().
If all machines are QOM objects this makes sense.
Acked-by: Marcel Apfelbaum
Thanks,
Marcel
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"
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/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 +-
20 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 42faa8c..5b11cd9 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 626d338..d59d9ba 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 e25cf5e..e37378c 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 d9e61f7..9a5f33b 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 68236a3..cd50691 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 90429fc..481ae00 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 607cb58..c3048f3 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 de8dbb2..c3c72f1 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 d061f0f..5f7523e 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 3154aea..9eca64c 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -798,4 +798,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 44bbbea..69eef0b 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1315,4 +1315,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_boa
[Qemu-devel] [PATCH 1/4] 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
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"
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/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 +-
20 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 42faa8c..5b11cd9 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 626d338..d59d9ba 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 e25cf5e..e37378c 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 d9e61f7..9a5f33b 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 68236a3..cd50691 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 90429fc..481ae00 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 607cb58..c3048f3 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 de8dbb2..c3c72f1 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 d061f0f..5f7523e 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 3154aea..9eca64c 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -798,4 +798,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 44bbbea..69eef0b 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1315,4 +1315,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 efa6f91..8d67657 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_ucl
