From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRzc-0007Iu-Fl for qemu-devel@nongnu.org; Wed, 27 Jul 2016 12:47:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSRzZ-0001yM-Kz for qemu-devel@nongnu.org; Wed, 27 Jul 2016 12:47:36 -0400 Received: from 20.mo7.mail-out.ovh.net ([46.105.49.208]:46337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRzZ-0001y9-9N for qemu-devel@nongnu.org; Wed, 27 Jul 2016 12:47:33 -0400 Received: from player796.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 5ACBDFFCFCB for ; Wed, 27 Jul 2016 18:47:31 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Wed, 27 Jul 2016 18:46:54 +0200 Message-Id: <1469638018-17590-3-git-send-email-clg@kaod.org> In-Reply-To: <1469638018-17590-1-git-send-email-clg@kaod.org> References: <1469638018-17590-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/6] palmetto-bmc: replace palmetto_bmc with aspeed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= This is mostly a name replacement to prepare ground for other socs specificities. It also adds a specific TypeInfo struct for the palmetto_bmc board with a custom initialization for the same reason. Signed-off-by: C=C3=A9dric Le Goater --- Should we change the name of the file to aspeed.c ? I am not found of such renames as it is then difficult to track code changes. hw/arm/palmetto-bmc.c | 54 ++++++++++++++++++++++++++++++++++-----------= ------ 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c index 1ee13d578899..f80a15733864 100644 --- a/hw/arm/palmetto-bmc.c +++ b/hw/arm/palmetto-bmc.c @@ -21,19 +21,19 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" =20 -static struct arm_boot_info palmetto_bmc_binfo =3D { +static struct arm_boot_info aspeed_binfo =3D { .loader_start =3D AST2400_SDRAM_BASE, .board_id =3D 0, .nb_cpus =3D 1, }; =20 -typedef struct PalmettoBMCState { +typedef struct AspeedBoardState { AST2400State soc; MemoryRegion ram; -} PalmettoBMCState; +} AspeedBoardState; =20 -static void palmetto_bmc_init_flashes(AspeedSMCState *s, const char *fla= shtype, - Error **errp) +static void aspeed_init_flashes(AspeedSMCState *s, const char *flashtype= , + Error **errp) { int i ; =20 @@ -58,11 +58,11 @@ static void palmetto_bmc_init_flashes(AspeedSMCState = *s, const char *flashtype, } } =20 -static void palmetto_bmc_init(MachineState *machine) +static void aspeed_init(MachineState *machine) { - PalmettoBMCState *bmc; + AspeedBoardState *bmc; =20 - bmc =3D g_new0(PalmettoBMCState, 1); + bmc =3D g_new0(AspeedBoardState, 1); object_initialize(&bmc->soc, (sizeof(bmc->soc)), TYPE_AST2400); object_property_add_child(OBJECT(machine), "soc", OBJECT(&bmc->soc), &error_abort); @@ -79,19 +79,26 @@ static void palmetto_bmc_init(MachineState *machine) object_property_set_bool(OBJECT(&bmc->soc), true, "realized", &error_abort); =20 - palmetto_bmc_init_flashes(&bmc->soc.smc, "n25q256a", &error_abort); - palmetto_bmc_init_flashes(&bmc->soc.spi, "mx25l25635e", &error_abort= ); + aspeed_init_flashes(&bmc->soc.smc, "n25q256a", &error_abort); + aspeed_init_flashes(&bmc->soc.spi, "mx25l25635e", &error_abort); + + aspeed_binfo.kernel_filename =3D machine->kernel_filename; + aspeed_binfo.initrd_filename =3D machine->initrd_filename; + aspeed_binfo.kernel_cmdline =3D machine->kernel_cmdline; + aspeed_binfo.ram_size =3D ram_size; + arm_load_kernel(ARM_CPU(first_cpu), &aspeed_binfo); +} =20 - palmetto_bmc_binfo.kernel_filename =3D machine->kernel_filename; - palmetto_bmc_binfo.initrd_filename =3D machine->initrd_filename; - palmetto_bmc_binfo.kernel_cmdline =3D machine->kernel_cmdline; - palmetto_bmc_binfo.ram_size =3D ram_size; - arm_load_kernel(ARM_CPU(first_cpu), &palmetto_bmc_binfo); +static void palmetto_bmc_init(MachineState *machine) +{ + aspeed_init(machine); } =20 -static void palmetto_bmc_machine_init(MachineClass *mc) +static void palmetto_bmc_class_init(ObjectClass *oc, void *data) { - mc->desc =3D "OpenPOWER Palmetto BMC"; + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "OpenPOWER Palmetto BMC (ARM926EJ-S)"; mc->init =3D palmetto_bmc_init; mc->max_cpus =3D 1; mc->no_sdcard =3D 1; @@ -101,4 +108,15 @@ static void palmetto_bmc_machine_init(MachineClass *= mc) mc->no_parallel =3D 1; } =20 -DEFINE_MACHINE("palmetto-bmc", palmetto_bmc_machine_init); +static const TypeInfo palmetto_bmc_type =3D { + .name =3D MACHINE_TYPE_NAME("palmetto-bmc"), + .parent =3D TYPE_MACHINE, + .class_init =3D palmetto_bmc_class_init, +}; + +static void aspeed_machine_init(void) +{ + type_register_static(&palmetto_bmc_type); +} + +type_init(aspeed_machine_init) --=20 2.1.4