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/integratorcp.c | |
| parent | f309ae852c67833c3cac11747474fbb013529382 (diff) | |
| download | focaccia-qemu-e264d29de28c5b0be3d063307ce9fb613b427cc3.tar.gz focaccia-qemu-e264d29de28c5b0be3d063307ce9fb613b427cc3.zip | |
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/integratorcp.c')
| -rw-r--r-- | hw/arm/integratorcp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index d87d36ff57..421bde9a1c 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -619,18 +619,13 @@ static void integratorcp_init(MachineState *machine) arm_load_kernel(cpu, &integrator_binfo); } -static QEMUMachine integratorcp_machine = { - .name = "integratorcp", - .desc = "ARM Integrator/CP (ARM926EJ-S)", - .init = integratorcp_init, -}; - -static void integratorcp_machine_init(void) +static void integratorcp_machine_init(MachineClass *mc) { - qemu_register_machine(&integratorcp_machine); + mc->desc = "ARM Integrator/CP (ARM926EJ-S)"; + mc->init = integratorcp_init; } -machine_init(integratorcp_machine_init); +DEFINE_MACHINE("integratorcp", integratorcp_machine_init) static Property core_properties[] = { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), |