From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85Wm-0005g3-D9 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85Wl-0000qD-Hy for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85Wl-0000p5-C0 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:22:27 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:20:44 +0200 Message-Id: <20171027142107.15542-17-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 16/39] sh4: r2d: 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-20-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/sh4/r2d.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 16b9ed2db2..458ed83297 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -225,7 +225,6 @@ static struct QEMU_PACKED =20 static void r2d_init(MachineState *machine) { - 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; @@ -242,11 +241,7 @@ static void r2d_init(MachineState *machine) MemoryRegion *address_space_mem =3D get_system_memory(); PCIBus *pci_bus; =20 - if (cpu_model =3D=3D NULL) { - cpu_model =3D "SH7751R"; - } - - cpu =3D SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model)); + cpu =3D SUPERH_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 reset_info =3D g_malloc0(sizeof(ResetData)); @@ -365,6 +360,7 @@ static void r2d_machine_init(MachineClass *mc) mc->desc =3D "r2d-plus board"; mc->init =3D r2d_init; mc->block_default_type =3D IF_IDE; + mc->default_cpu_type =3D TYPE_SH7751R_CPU; } =20 DEFINE_MACHINE("r2d", r2d_machine_init) --=20 2.13.6