From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85YD-0000ql-2x for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85Y9-0002OA-TF for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35082) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85Y9-0002Nl-NY for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:53 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:21:03 +0200 Message-Id: <20171027142107.15542-36-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 35/39] mips: Magnum/Acer Pica 61: 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 Reviewed-by: Herv=C3=A9 Poussineau Message-Id: <1507211474-188400-39-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/mips/mips_jazz.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 7e6626dc88..fe4f17389f 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -122,7 +122,6 @@ static void mips_jazz_init(MachineState *machine, enum jazz_model_e jazz_model) { MemoryRegion *address_space =3D get_system_memory(); - const char *cpu_model =3D machine->cpu_model; char *filename; int bios_size, n; MIPSCPU *cpu; @@ -148,10 +147,7 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *bios2 =3D g_new(MemoryRegion, 1); =20 /* init CPUs */ - if (cpu_model =3D=3D NULL) { - cpu_model =3D "R4000"; - } - 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; qemu_register_reset(main_cpu_reset, cpu); =20 @@ -349,6 +345,7 @@ static void mips_magnum_class_init(ObjectClass *oc, v= oid *data) mc->desc =3D "MIPS Magnum"; mc->init =3D mips_magnum_init; mc->block_default_type =3D IF_SCSI; + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("R4000"); } =20 static const TypeInfo mips_magnum_type =3D { @@ -364,6 +361,7 @@ static void mips_pica61_class_init(ObjectClass *oc, v= oid *data) mc->desc =3D "Acer Pica 61"; mc->init =3D mips_pica61_init; mc->block_default_type =3D IF_SCSI; + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("R4000"); } =20 static const TypeInfo mips_pica61_type =3D { --=20 2.13.6