[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/21] exynos4: Declare each QEMUMachine as a separat
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 16/21] exynos4: Declare each QEMUMachine as a separate variable |
Date: |
Sat, 19 Sep 2015 16:43:25 +0200 |
From: Eduardo Habkost <address@hidden>
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 <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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.4
- [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME, (continued)
- [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 07/21] arm: Rename virt machine class to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 09/21] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 10/21] s390: Rename s390-ccw-virtio-2.4 class name to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 08/21] pseries: Rename machine class names to use MACHINE_TYPE_NAME, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 11/21] mac99: Use MACHINE_TYPE_NAME to encode class name, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 14/21] exynos4: Use EXYNOS4210_NCPUS instead of max_cpus on error message, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 13/21] machine: Set MachineClass::name automatically, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 15/21] exynos4: Use MachineClass instead of exynos4_machines array, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 16/21] exynos4: Declare each QEMUMachine as a separate variable,
Andreas Färber <=
- [Qemu-devel] [PULL 17/21] machine: DEFINE_MACHINE() macro, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 18/21] mac_world: Break long line, Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 21/21] machine: Eliminate QEMUMachine and qemu_register_machine(), Andreas Färber, 2015/09/19
- [Qemu-devel] [PULL 20/21] Revert use of DEFINE_MACHINE() for registrations of multiple machines, Andreas Färber, 2015/09/19
[Qemu-devel] [PULL 19/21] Use DEFINE_MACHINE() to register all machines, Andreas Färber, 2015/09/19