From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85YF-0000xP-9X for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:24:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85YE-0002R8-Bz for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85YE-0002QE-5g for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:58 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:21:04 +0200 Message-Id: <20171027142107.15542-37-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 36/39] mips: mipssim: replace cpu_model with cpu_type 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-40-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/mips/mips_mipssim.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index a092072e2a..e5d3654586 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -141,7 +141,6 @@ static void mips_mipssim_init(MachineState *machine) { 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; @@ -156,14 +155,7 @@ mips_mipssim_init(MachineState *machine) int bios_size; =20 /* Init CPUs. */ - if (cpu_model =3D=3D NULL) { -#ifdef TARGET_MIPS64 - cpu_model =3D "5Kf"; -#else - cpu_model =3D "24Kf"; -#endif - } - cpu =3D MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model)); + cpu =3D MIPS_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 reset_info =3D g_malloc0(sizeof(ResetData)); @@ -235,6 +227,11 @@ static void mips_mipssim_machine_init(MachineClass *= mc) { mc->desc =3D "MIPS MIPSsim platform"; mc->init =3D mips_mipssim_init; +#ifdef TARGET_MIPS64 + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("5Kf"); +#else + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); +#endif } =20 DEFINE_MACHINE("mipssim", mips_mipssim_machine_init) --=20 2.13.6