From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRzg-0007MI-Nq for qemu-devel@nongnu.org; Wed, 27 Jul 2016 12:47:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSRzd-0001zt-SZ for qemu-devel@nongnu.org; Wed, 27 Jul 2016 12:47:40 -0400 Received: from 4.mo7.mail-out.ovh.net ([178.32.122.254]:39490) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSRzd-0001zS-La for qemu-devel@nongnu.org; Wed, 27 Jul 2016 12:47:37 -0400 Received: from player796.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id AD303FFCF8F for ; Wed, 27 Jul 2016 18:47:36 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Wed, 27 Jul 2016 18:46:55 +0200 Message-Id: <1469638018-17590-4-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 3/6] ast2400: use machine cpu_model to initialize the soc cpu 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?= It will be easier to specify a different cpu for other soc derived from the ast2400 soc. Signed-off-by: C=C3=A9dric Le Goater --- hw/arm/ast2400.c | 8 +++++++- hw/arm/palmetto-bmc.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/arm/ast2400.c b/hw/arm/ast2400.c index fa535065f765..7f3517a2c6c6 100644 --- a/hw/arm/ast2400.c +++ b/hw/arm/ast2400.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "cpu.h" #include "exec/address-spaces.h" +#include "hw/boards.h" #include "hw/arm/ast2400.h" #include "hw/char/serial.h" #include "qemu/log.h" @@ -65,9 +66,14 @@ static const MemoryRegionOps ast2400_io_ops =3D { =20 static void ast2400_init(Object *obj) { + const char *cpu_model =3D current_machine->cpu_model; AST2400State *s =3D AST2400(obj); =20 - s->cpu =3D cpu_arm_init("arm926"); + if (!cpu_model) { + cpu_model =3D "arm926"; + } + + s->cpu =3D cpu_arm_init(cpu_model); =20 object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC); object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL); diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c index f80a15733864..8a3ff5568575 100644 --- a/hw/arm/palmetto-bmc.c +++ b/hw/arm/palmetto-bmc.c @@ -91,6 +91,7 @@ static void aspeed_init(MachineState *machine) =20 static void palmetto_bmc_init(MachineState *machine) { + machine->cpu_model =3D "arm926"; aspeed_init(machine); } =20 --=20 2.1.4