From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85Y5-0000Yx-Jq for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85Y4-0002Kr-Mo for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85Y4-0002Jl-Gj for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:48 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:21:02 +0200 Message-Id: <20171027142107.15542-35-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 34/39] mips: fulong2e: 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-38-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/mips/mips_fulong2e.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 75318680e1..146cf0fccd 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -258,7 +258,6 @@ static void network_init (PCIBus *pci_bus) static void mips_fulong2e_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; @@ -277,10 +276,7 @@ static void mips_fulong2e_init(MachineState *machine= ) CPUMIPSState *env; =20 /* init CPUs */ - if (cpu_model =3D=3D NULL) { - cpu_model =3D "Loongson-2E"; - } - 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 qemu_register_reset(main_cpu_reset, cpu); @@ -385,6 +381,7 @@ static void mips_fulong2e_machine_init(MachineClass *= mc) mc->desc =3D "Fulong 2e mini pc"; mc->init =3D mips_fulong2e_init; mc->block_default_type =3D IF_IDE; + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-2E"); } =20 DEFINE_MACHINE("fulong2e", mips_fulong2e_machine_init) --=20 2.13.6