From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85W3-0002Tj-9T for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:21:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85W0-0008MR-4i for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:21:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46822) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85Vz-0008Lj-Uk for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:21:40 -0400 From: Eduardo Habkost Date: Fri, 27 Oct 2017 16:20:34 +0200 Message-Id: <20171027142107.15542-7-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 06/39] lm32: milkymist: 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 Acked-by: Michael Walle Message-Id: <1507211474-188400-10-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/lm32/milkymist.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 4db4d2d533..d4e765f2eb 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -80,7 +80,6 @@ static void main_cpu_reset(void *opaque) static void milkymist_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; @@ -108,10 +107,7 @@ milkymist_init(MachineState *machine) =20 reset_info =3D g_malloc0(sizeof(ResetInfo)); =20 - if (cpu_model =3D=3D NULL) { - cpu_model =3D "lm32-full"; - } - cpu =3D LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model)); + cpu =3D LM32_CPU(cpu_create(machine->cpu_type)); =20 env =3D &cpu->env; reset_info->cpu =3D cpu; @@ -216,6 +212,7 @@ static void milkymist_machine_init(MachineClass *mc) mc->desc =3D "Milkymist One"; mc->init =3D milkymist_init; mc->is_default =3D 0; + mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); } =20 DEFINE_MACHINE("milkymist", milkymist_machine_init) --=20 2.13.6