From nobody Sun Nov 2 11:51:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509115558247264.7653310089835; Fri, 27 Oct 2017 07:45:58 -0700 (PDT) Received: from localhost ([::1]:57660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85tE-0004QW-BU for importer@patchew.org; Fri, 27 Oct 2017 10:45:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85XJ-000721-KY for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85XI-0001VG-Kl for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85XI-0001UG-B9 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:00 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 697B26A7CA; Fri, 27 Oct 2017 14:22:59 +0000 (UTC) Received: from localhost (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D66281A61; Fri, 27 Oct 2017 14:22:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 697B26A7CA Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: Peter Maydell Date: Fri, 27 Oct 2017 16:20:51 +0200 Message-Id: <20171027142107.15542-24-ehabkost@redhat.com> In-Reply-To: <20171027142107.15542-1-ehabkost@redhat.com> References: <20171027142107.15542-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 27 Oct 2017 14:22:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 23/39] xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <1507211474-188400-27-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost --- hw/xtensa/xtfpga.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index a19ccebdba..1971ecfdc5 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -220,19 +220,14 @@ static void lx_init(const LxBoardDesc *board, Machine= State *machine) DriveInfo *dinfo; pflash_t *flash =3D NULL; QemuOpts *machine_opts =3D qemu_get_machine_opts(); - const char *cpu_model =3D machine->cpu_model; const char *kernel_filename =3D qemu_opt_get(machine_opts, "kernel"); const char *kernel_cmdline =3D qemu_opt_get(machine_opts, "append"); const char *dtb_filename =3D qemu_opt_get(machine_opts, "dtb"); const char *initrd_filename =3D qemu_opt_get(machine_opts, "initrd"); int n; =20 - if (!cpu_model) { - cpu_model =3D XTENSA_DEFAULT_CPU_MODEL; - } - for (n =3D 0; n < smp_cpus; n++) { - cpu =3D XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model)); + cpu =3D XTENSA_CPU(cpu_create(machine->cpu_type)); env =3D &cpu->env; =20 env->sregs[PRID] =3D n; @@ -454,6 +449,7 @@ static void xtensa_lx60_class_init(ObjectClass *oc, voi= d *data) mc->desc =3D "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; mc->init =3D xtensa_lx60_init; mc->max_cpus =3D 4; + mc->default_cpu_type =3D XTENSA_DEFAULT_CPU_TYPE; } =20 static const TypeInfo xtensa_lx60_type =3D { @@ -469,6 +465,7 @@ static void xtensa_lx200_class_init(ObjectClass *oc, vo= id *data) mc->desc =3D "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; mc->init =3D xtensa_lx200_init; mc->max_cpus =3D 4; + mc->default_cpu_type =3D XTENSA_DEFAULT_CPU_TYPE; } =20 static const TypeInfo xtensa_lx200_type =3D { @@ -484,6 +481,7 @@ static void xtensa_ml605_class_init(ObjectClass *oc, vo= id *data) mc->desc =3D "ml605 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; mc->init =3D xtensa_ml605_init; mc->max_cpus =3D 4; + mc->default_cpu_type =3D XTENSA_DEFAULT_CPU_TYPE; } =20 static const TypeInfo xtensa_ml605_type =3D { @@ -499,6 +497,7 @@ static void xtensa_kc705_class_init(ObjectClass *oc, vo= id *data) mc->desc =3D "kc705 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; mc->init =3D xtensa_kc705_init; mc->max_cpus =3D 4; + mc->default_cpu_type =3D XTENSA_DEFAULT_CPU_TYPE; } =20 static const TypeInfo xtensa_kc705_type =3D { --=20 2.13.6