From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmJC-0007ps-GW for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSmJ7-0005uf-Rm for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:10 -0400 Received: from 13.mo7.mail-out.ovh.net ([87.98.150.175]:42560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSmJ7-0005uT-LY for qemu-devel@nongnu.org; Thu, 28 Jul 2016 10:29:05 -0400 Received: from player796.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id 53CDC1010444 for ; Thu, 28 Jul 2016 16:29:00 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Thu, 28 Jul 2016 16:28:14 +0200 Message-Id: <1469716099-8975-5-git-send-email-clg@kaod.org> In-Reply-To: <1469716099-8975-1-git-send-email-clg@kaod.org> References: <1469716099-8975-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 v2 4/9] 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 --- Change since v1: - remove check on cpu_model.=20 hw/arm/aspeed.c | 1 + hw/arm/ast2400.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index f80a15733864..8a3ff5568575 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.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 diff --git a/hw/arm/ast2400.c b/hw/arm/ast2400.c index fa535065f765..84f3b444db09 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" @@ -67,7 +68,7 @@ static void ast2400_init(Object *obj) { AST2400State *s =3D AST2400(obj); =20 - s->cpu =3D cpu_arm_init("arm926"); + s->cpu =3D cpu_arm_init(current_machine->cpu_model); =20 object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC); object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL); --=20 2.1.4