From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdKC3-0007pp-VH for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdKC2-00060V-KQ for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:51 -0400 Received: from mx2.suse.de ([195.135.220.15]:42791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdKC2-00060A-AR for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:50 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 17:36:42 +0200 Message-Id: <1442677004-4482-6-git-send-email-afaerber@suse.de> In-Reply-To: <1442677004-4482-1-git-send-email-afaerber@suse.de> References: <1442677004-4482-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 5/6] exynos4: Further QOM'ify machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Evgeny Voevodin , Igor Mitsyanko , Dmitry Solodkiy , Maksim Kozlov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Drop board enumeration in favor of an abstract type, and move static tables into class initialization. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/exynos4_boards.c | 71 ++++++++++++++++++++++++++-----------------= ------ 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 336c8b2..ec7f235 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -46,26 +46,17 @@ =20 #define SMDK_LAN9118_BASE_ADDR 0x05000000 =20 -typedef enum Exynos4BoardType { - EXYNOS4_BOARD_NURI, - EXYNOS4_BOARD_SMDKC210, - EXYNOS4_NUM_OF_BOARDS -} Exynos4BoardType; - -static int exynos4_board_id[EXYNOS4_NUM_OF_BOARDS] =3D { - [EXYNOS4_BOARD_NURI] =3D 0xD33, - [EXYNOS4_BOARD_SMDKC210] =3D 0xB16, -}; +typedef struct Exynos4MachineClass { + MachineClass parent_class; =20 -static int exynos4_board_smp_bootreg_addr[EXYNOS4_NUM_OF_BOARDS] =3D { - [EXYNOS4_BOARD_NURI] =3D EXYNOS4210_SECOND_CPU_BOOTREG, - [EXYNOS4_BOARD_SMDKC210] =3D EXYNOS4210_SECOND_CPU_BOOTREG, -}; + int id; + int smp_bootreg_addr; + unsigned long ram_size; +} Exynos4MachineClass; =20 -static unsigned long exynos4_board_ram_size[EXYNOS4_NUM_OF_BOARDS] =3D { - [EXYNOS4_BOARD_NURI] =3D 0x40000000, - [EXYNOS4_BOARD_SMDKC210] =3D 0x40000000, -}; +#define TYPE_EXYNOS4_MACHINE MACHINE_TYPE_NAME("exynos4") +#define EXYNOS4_MACHINE_CLASS(cls) \ + OBJECT_CLASS_CHECK(Exynos4MachineClass, (cls), TYPE_EXYNOS4_MACHINE) =20 static struct arm_boot_info exynos4_board_binfo =3D { .loader_start =3D EXYNOS4210_BASE_BOOT_ADDR, @@ -92,10 +83,10 @@ static void lan9215_init(uint32_t base, qemu_irq irq) } } =20 -static Exynos4210State *exynos4_boards_init_common(MachineState *machine= , - Exynos4BoardType boar= d_type) +static Exynos4210State *exynos4_boards_init_common(MachineState *machine= ) { MachineClass *mc =3D MACHINE_GET_CLASS(machine); + Exynos4MachineClass *emc =3D EXYNOS4_MACHINE_CLASS(mc); =20 if (smp_cpus !=3D EXYNOS4210_NCPUS && !qtest_enabled()) { fprintf(stderr, "%s board supports only %d CPU cores. Ignoring s= mp_cpus" @@ -103,10 +94,9 @@ static Exynos4210State *exynos4_boards_init_common(Ma= chineState *machine, mc->name, EXYNOS4210_NCPUS); } =20 - exynos4_board_binfo.ram_size =3D exynos4_board_ram_size[board_type]; - exynos4_board_binfo.board_id =3D exynos4_board_id[board_type]; - exynos4_board_binfo.smp_bootreg_addr =3D - exynos4_board_smp_bootreg_addr[board_type]; + exynos4_board_binfo.ram_size =3D emc->ram_size; + exynos4_board_binfo.board_id =3D emc->id; + exynos4_board_binfo.smp_bootreg_addr =3D emc->smp_bootreg_addr; exynos4_board_binfo.kernel_filename =3D machine->kernel_filename; exynos4_board_binfo.initrd_filename =3D machine->initrd_filename; exynos4_board_binfo.kernel_cmdline =3D machine->kernel_cmdline; @@ -117,27 +107,24 @@ static Exynos4210State *exynos4_boards_init_common(= MachineState *machine, " kernel_filename: %s\n" " kernel_cmdline: %s\n" " initrd_filename: %s\n", - exynos4_board_ram_size[board_type] / 1048576, - exynos4_board_ram_size[board_type], + emc->ram_size / 1048576, emc->ram_size, machine->kernel_filename, machine->kernel_cmdline, machine->initrd_filename); =20 - return exynos4210_init(get_system_memory(), - exynos4_board_ram_size[board_type]); + return exynos4210_init(get_system_memory(), emc->ram_size); } =20 static void nuri_init(MachineState *machine) { - exynos4_boards_init_common(machine, EXYNOS4_BOARD_NURI); + exynos4_boards_init_common(machine); =20 arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo); } =20 static void smdkc210_init(MachineState *machine) { - Exynos4210State *s =3D exynos4_boards_init_common(machine, - EXYNOS4_BOARD_SMDKC2= 10); + Exynos4210State *s =3D exynos4_boards_init_common(machine); =20 lan9215_init(SMDK_LAN9118_BASE_ADDR, qemu_irq_invert(s->irq_table[exynos4210_get_irq(37, 1)])); @@ -147,35 +134,53 @@ static void smdkc210_init(MachineState *machine) static void nuri_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); + Exynos4MachineClass *emc =3D EXYNOS4_MACHINE_CLASS(oc); =20 mc->desc =3D "Samsung NURI board (Exynos4210)"; mc->init =3D nuri_init; mc->max_cpus =3D EXYNOS4210_NCPUS; + + emc->id =3D 0xD33; + emc->smp_bootreg_addr =3D EXYNOS4210_SECOND_CPU_BOOTREG; + emc->ram_size =3D 0x40000000; } =20 static const TypeInfo nuri_type =3D { .name =3D MACHINE_TYPE_NAME("nuri"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_EXYNOS4_MACHINE, .class_init =3D nuri_class_init, }; =20 static void smdkc210_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); + Exynos4MachineClass *emc =3D EXYNOS4_MACHINE_CLASS(oc); =20 mc->desc =3D "Samsung SMDKC210 board (Exynos4210)"; mc->init =3D smdkc210_init; mc->max_cpus =3D EXYNOS4210_NCPUS; + + emc->id =3D 0xB16; + emc->smp_bootreg_addr =3D EXYNOS4210_SECOND_CPU_BOOTREG; + emc->ram_size =3D 0x40000000; } =20 static const TypeInfo smdkc210_type =3D { .name =3D MACHINE_TYPE_NAME("smdkc210"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_EXYNOS4_MACHINE, .class_init =3D smdkc210_class_init, }; =20 +static const TypeInfo exynos4_machine_type =3D { + .name =3D TYPE_EXYNOS4_MACHINE, + .parent =3D TYPE_MACHINE, + .abstract =3D true, + .class_size =3D sizeof(Exynos4MachineClass), +}; + static void exynos4_machines_init(void) { + type_register_static(&exynos4_machine_type); type_register_static(&nuri_type); type_register_static(&smdkc210_type); } --=20 2.1.4