From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85WZ-0005SI-AR for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85WY-0000Uw-8v for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48284) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85WY-0000U4-2a for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:14 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:20:41 +0200 Message-Id: <20171027142107.15542-14-ehabkost@redhat.com> In-Reply-To: <20171027142107.15542-1-ehabkost@redhat.com> References: <20171027142107.15542-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 13/39] moxie: use generic cpu_model parsing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: qemu-devel@nongnu.org, Igor Mammedov From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <1507211474-188400-17-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/moxie/moxiesim.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 01b9f34f87..3ba58481d0 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -103,7 +103,6 @@ static void moxiesim_init(MachineState *machine) { MoxieCPU *cpu =3D NULL; ram_addr_t ram_size =3D machine->ram_size; - 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; @@ -115,10 +114,7 @@ static void moxiesim_init(MachineState *machine) LoaderParams loader_params; =20 /* Init CPUs. */ - if (cpu_model =3D=3D NULL) { - cpu_model =3D "MoxieLite"; - } - cpu =3D MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model)); + cpu =3D MOXIE_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 qemu_register_reset(main_cpu_reset, cpu); @@ -150,6 +146,7 @@ static void moxiesim_machine_init(MachineClass *mc) mc->desc =3D "Moxie simulator platform"; mc->init =3D moxiesim_init; mc->is_default =3D 1; + mc->default_cpu_type =3D MOXIE_CPU_TYPE_NAME("MoxieLite"); } =20 DEFINE_MACHINE("moxiesim", moxiesim_machine_init) --=20 2.13.6