diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-09-04 15:37:05 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-09-19 16:39:55 +0200 |
| commit | 97c6671cf16640f997fc8c54ef456bbad125b635 (patch) | |
| tree | 0e39dc6b19168e18aef5ef19f0cc18d52167d701 /hw | |
| parent | ca17776088e41dabdc3bb07334dbc73d631e30e3 (diff) | |
| download | qemu-97c6671cf16640f997fc8c54ef456bbad125b635.zip qemu-97c6671cf16640f997fc8c54ef456bbad125b635.tar.gz qemu-97c6671cf16640f997fc8c54ef456bbad125b635.tar.bz2 | |
exynos4: Declare each QEMUMachine as a separate variable
This will make the code follow the same pattern used for other machines,
and will make it easier to automatically convert the code to be
QOM-based.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/exynos4_boards.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 312a014..35fc7c4 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -74,8 +74,6 @@ static struct arm_boot_info exynos4_board_binfo = { .write_secondary_boot = exynos4210_write_secondary, }; -static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS]; - static void lan9215_init(uint32_t base, qemu_irq irq) { DeviceState *dev; @@ -146,25 +144,24 @@ static void smdkc210_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo); } -static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS] = { - [EXYNOS4_BOARD_NURI] = { - .name = "nuri", - .desc = "Samsung NURI board (Exynos4210)", - .init = nuri_init, - .max_cpus = EXYNOS4210_NCPUS, - }, - [EXYNOS4_BOARD_SMDKC210] = { - .name = "smdkc210", - .desc = "Samsung SMDKC210 board (Exynos4210)", - .init = smdkc210_init, - .max_cpus = EXYNOS4210_NCPUS, - }, +static QEMUMachine exynos4_machine_nuri = { + .name = "nuri", + .desc = "Samsung NURI board (Exynos4210)", + .init = nuri_init, + .max_cpus = EXYNOS4210_NCPUS, +}; + +static QEMUMachine exynos4_machine_smdkc210 = { + .name = "smdkc210", + .desc = "Samsung SMDKC210 board (Exynos4210)", + .init = smdkc210_init, + .max_cpus = EXYNOS4210_NCPUS, }; static void exynos4_machine_init(void) { - qemu_register_machine(&exynos4_machines[EXYNOS4_BOARD_NURI]); - qemu_register_machine(&exynos4_machines[EXYNOS4_BOARD_SMDKC210]); + qemu_register_machine(&exynos4_machine_nuri); + qemu_register_machine(&exynos4_machine_smdkc210); } machine_init(exynos4_machine_init); |