From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85XH-0006w6-Os for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85XE-0001RC-Kq for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33234) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85XE-0001QS-Dw for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:56 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:20:50 +0200 Message-Id: <20171027142107.15542-23-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 22/39] xtensa: sim: 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-26-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/xtensa/sim.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index b3580b11fa..2bb883b664 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -75,16 +75,11 @@ static void xtensa_sim_init(MachineState *machine) XtensaCPU *cpu =3D NULL; CPUXtensaState *env =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; int n; =20 - if (!cpu_model) { - cpu_model =3D XTENSA_DEFAULT_CPU_MODEL; - } - for (n =3D 0; n < smp_cpus; n++) { - cpu =3D XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model))= ; + cpu =3D XTENSA_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 env->sregs[PRID] =3D n; @@ -133,6 +128,7 @@ static void xtensa_sim_machine_init(MachineClass *mc) mc->init =3D xtensa_sim_init; mc->max_cpus =3D 4; mc->no_serial =3D 1; + mc->default_cpu_type =3D XTENSA_DEFAULT_CPU_TYPE; } =20 DEFINE_MACHINE("sim", xtensa_sim_machine_init) --=20 2.13.6