From nobody Sun Nov 2 11:50:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509114411148218.9524968359384; Fri, 27 Oct 2017 07:26:51 -0700 (PDT) Received: from localhost ([::1]:57571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85aq-0006mH-7k for importer@patchew.org; Fri, 27 Oct 2017 10:26:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85W5-0002V6-Gy for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:21:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85W4-0008QO-IE for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:21:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85W4-0008Pn-9n for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:21:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61AEEC0587DB; Fri, 27 Oct 2017 14:21:43 +0000 (UTC) Received: from localhost (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 582605D9C1; Fri, 27 Oct 2017 14:21:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 61AEEC0587DB Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: Peter Maydell Date: Fri, 27 Oct 2017 16:20:35 +0200 Message-Id: <20171027142107.15542-8-ehabkost@redhat.com> In-Reply-To: <20171027142107.15542-1-ehabkost@redhat.com> References: <20171027142107.15542-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 27 Oct 2017 14:21:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 07/39] lm32: lm32_boards: use generic cpu_model parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael Walle Message-Id: <1507211474-188400-11-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/lm32/lm32_boards.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index b0bb3ef58a..002d638edd 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -75,7 +75,6 @@ static void main_cpu_reset(void *opaque) =20 static void lm32_evr_init(MachineState *machine) { - const char *cpu_model =3D machine->cpu_model; const char *kernel_filename =3D machine->kernel_filename; LM32CPU *cpu; CPULM32State *env; @@ -101,10 +100,7 @@ static void lm32_evr_init(MachineState *machine) =20 reset_info =3D g_malloc0(sizeof(ResetInfo)); =20 - if (cpu_model =3D=3D NULL) { - cpu_model =3D "lm32-full"; - } - cpu =3D LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model)); + cpu =3D LM32_CPU(cpu_create(machine->cpu_type)); =20 env =3D &cpu->env; reset_info->cpu =3D cpu; @@ -163,7 +159,6 @@ static void lm32_evr_init(MachineState *machine) =20 static void lm32_uclinux_init(MachineState *machine) { - const char *cpu_model =3D machine->cpu_model; const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; @@ -198,10 +193,7 @@ static void lm32_uclinux_init(MachineState *machine) =20 reset_info =3D g_malloc0(sizeof(ResetInfo)); =20 - if (cpu_model =3D=3D NULL) { - cpu_model =3D "lm32-full"; - } - cpu =3D LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model)); + cpu =3D LM32_CPU(cpu_create(machine->cpu_type)); =20 env =3D &cpu->env; reset_info->cpu =3D cpu; @@ -295,6 +287,7 @@ static void lm32_evr_class_init(ObjectClass *oc, void *= data) mc->desc =3D "LatticeMico32 EVR32 eval system"; mc->init =3D lm32_evr_init; mc->is_default =3D 1; + mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 static const TypeInfo lm32_evr_type =3D { @@ -310,6 +303,7 @@ static void lm32_uclinux_class_init(ObjectClass *oc, vo= id *data) mc->desc =3D "lm32 platform for uClinux and u-boot by Theobroma System= s"; mc->init =3D lm32_uclinux_init; mc->is_default =3D 0; + mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 static const TypeInfo lm32_uclinux_type =3D { --=20 2.13.6