diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-09-04 15:37:08 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-09-19 16:40:15 +0200 |
| commit | e264d29de28c5b0be3d063307ce9fb613b427cc3 (patch) | |
| tree | 5e8d9622965ee60421eddbb26dcb42ab8bea7712 /hw/arm/realview.c | |
| parent | f309ae852c67833c3cac11747474fbb013529382 (diff) | |
Use DEFINE_MACHINE() to register all machines
Convert all machines to use DEFINE_MACHINE() instead of QEMUMachine
automatically using a script.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
[AF: Style cleanups, convert imx25_pdk machine]
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/arm/realview.c')
| -rw-r--r-- | hw/arm/realview.c | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 23779ec274..6c838178f7 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -399,41 +399,39 @@ static void realview_pbx_a9_init(MachineState *machine) realview_init(machine, BOARD_PBX_A9); } -static QEMUMachine realview_eb_machine = { - .name = "realview-eb", - .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)", - .init = realview_eb_init, - .block_default_type = IF_SCSI, -}; +static void realview_eb_machine_init(MachineClass *mc) +{ + mc->desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)"; + mc->init = realview_eb_init; + mc->block_default_type = IF_SCSI; +} -static QEMUMachine realview_eb_mpcore_machine = { - .name = "realview-eb-mpcore", - .desc = "ARM RealView Emulation Baseboard (ARM11MPCore)", - .init = realview_eb_mpcore_init, - .block_default_type = IF_SCSI, - .max_cpus = 4, -}; +DEFINE_MACHINE("realview-eb", realview_eb_machine_init) -static QEMUMachine realview_pb_a8_machine = { - .name = "realview-pb-a8", - .desc = "ARM RealView Platform Baseboard for Cortex-A8", - .init = realview_pb_a8_init, -}; +static void realview_eb_mpcore_machine_init(MachineClass *mc) +{ + mc->desc = "ARM RealView Emulation Baseboard (ARM11MPCore)"; + mc->init = realview_eb_mpcore_init; + mc->block_default_type = IF_SCSI; + mc->max_cpus = 4; +} -static QEMUMachine realview_pbx_a9_machine = { - .name = "realview-pbx-a9", - .desc = "ARM RealView Platform Baseboard Explore for Cortex-A9", - .init = realview_pbx_a9_init, - .block_default_type = IF_SCSI, - .max_cpus = 4, -}; +DEFINE_MACHINE("realview-eb-mpcore", realview_eb_mpcore_machine_init) + +static void realview_pb_a8_machine_init(MachineClass *mc) +{ + mc->desc = "ARM RealView Platform Baseboard for Cortex-A8"; + mc->init = realview_pb_a8_init; +} + +DEFINE_MACHINE("realview-pb-a8", realview_pb_a8_machine_init) -static void realview_machine_init(void) +static void realview_pbx_a9_machine_init(MachineClass *mc) { - qemu_register_machine(&realview_eb_machine); - qemu_register_machine(&realview_eb_mpcore_machine); - qemu_register_machine(&realview_pb_a8_machine); - qemu_register_machine(&realview_pbx_a9_machine); + mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9"; + mc->init = realview_pbx_a9_init; + mc->block_default_type = IF_SCSI; + mc->max_cpus = 4; } -machine_init(realview_machine_init); +DEFINE_MACHINE("realview-pbx-a9", realview_pbx_a9_machine_init) |