Received: from eggs.gnu.org ([2001:4830:134:3::10]:39407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRmGk-0007DL-Qj for qemu-devel@nongnu.org; Tue, 18 Aug 2015 15:09:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRmGg-0005ey-G5 for qemu-devel@nongnu.org; Tue, 18 Aug 2015 15:09:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRmGg-0005eg-BV for qemu-devel@nongnu.org; Tue, 18 Aug 2015 15:09:54 -0400 From: Eduardo Habkost Date: Tue, 18 Aug 2015 12:08:50 -0700 Message-Id: <1439924934-30491-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1439924934-30491-1-git-send-email-ehabkost@redhat.com> References: <1439924934-30491-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 3/7] exynos4: Declare each QEMUMachine as a separate variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Evgeny Voevodin , Marcel Apfelbaum , Igor Mitsyanko , "Michael S. Tsirkin" , Dmitry Solodkiy , Maksim Kozlov 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. Cc: Peter Maydell Cc: Evgeny Voevodin Cc: Maksim Kozlov Cc: Igor Mitsyanko Cc: Dmitry Solodkiy Signed-off-by: Eduardo Habkost --- hw/arm/exynos4_boards.c | 31 ++++++++++++++----------------- 1 file 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); -- 2.1.0