From nobody Sun Nov 2 11:43:18 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 1509115899189898.6418337300579; Fri, 27 Oct 2017 07:51:39 -0700 (PDT) Received: from localhost ([::1]:57679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85ye-0008Gm-Cw for importer@patchew.org; Fri, 27 Oct 2017 10:51:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e85Xt-00006R-82 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e85Xm-0001wz-P7 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e85Xm-0001vc-G5 for qemu-devel@nongnu.org; Fri, 27 Oct 2017 10:23:30 -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 8FBA25FD4E; Fri, 27 Oct 2017 14:23:29 +0000 (UTC) Received: from localhost (ovpn-116-67.gru2.redhat.com [10.97.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C5D35EE0B; Fri, 27 Oct 2017 14:23:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8FBA25FD4E Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.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:58 +0200 Message-Id: <20171027142107.15542-31-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.25]); Fri, 27 Oct 2017 14:23:29 +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 30/39] sparc: sparc: 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 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <1507211474-188400-34-git-send-email-imammedo@redhat.com> Reviewed-by: Artyom Tarasenko Acked-by: Mark Cave-Ayland Signed-off-by: Eduardo Habkost --- hw/sparc/sun4m.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index e1bdd4828d..68b23784c5 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -94,7 +94,6 @@ struct sun4m_hwdef { } vsimm[MAX_VSIMMS]; hwaddr ecc_base; uint64_t max_mem; - const char * const default_cpu_model; uint32_t ecc_version; uint32_t iommu_version; uint16_t machine_id; @@ -790,14 +789,14 @@ static const TypeInfo ram_info =3D { .class_init =3D ram_class_init, }; =20 -static void cpu_devinit(const char *cpu_model, unsigned int id, +static void cpu_devinit(const char *cpu_type, unsigned int id, uint64_t prom_addr, qemu_irq **cpu_irqs) { CPUState *cs; SPARCCPU *cpu; CPUSPARCState *env; =20 - cpu =3D SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model)); + cpu =3D SPARC_CPU(cpu_create(cpu_type)); env =3D &cpu->env; =20 cpu_sparc_set_id(env, id); @@ -820,7 +819,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, MachineState *machine) { DeviceState *slavio_intctl; - const char *cpu_model =3D machine->cpu_model; unsigned int i; void *iommu, *espdma, *ledma, *nvram; qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS], @@ -833,11 +831,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hw= def, unsigned int num_vsimms; =20 /* init CPUs */ - if (!cpu_model) - cpu_model =3D hwdef->default_cpu_model; - for(i =3D 0; i < smp_cpus; i++) { - cpu_devinit(cpu_model, i, hwdef->slavio_base, &cpu_irqs[i]); + cpu_devinit(machine->cpu_type, i, hwdef->slavio_base, &cpu_irqs[i]= ); } =20 for (i =3D smp_cpus; i < MAX_CPUS; i++) @@ -1074,7 +1069,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss5_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - .default_cpu_model =3D "Fujitsu MB86904", }, /* SS-10 */ { @@ -1100,7 +1094,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss10_id, .iommu_version =3D 0x03000000, .max_mem =3D 0xf00000000ULL, - .default_cpu_model =3D "TI SuperSparc II", }, /* SS-600MP */ { @@ -1124,7 +1117,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss600mp_id, .iommu_version =3D 0x01000000, .max_mem =3D 0xf00000000ULL, - .default_cpu_model =3D "TI SuperSparc II", }, /* SS-20 */ { @@ -1166,7 +1158,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss20_id, .iommu_version =3D 0x13000000, .max_mem =3D 0xf00000000ULL, - .default_cpu_model =3D "TI SuperSparc II", }, /* Voyager */ { @@ -1190,7 +1181,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D vger_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - .default_cpu_model =3D "Fujitsu MB86904", }, /* LX */ { @@ -1215,7 +1205,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D lx_id, .iommu_version =3D 0x04000000, .max_mem =3D 0x10000000, - .default_cpu_model =3D "TI MicroSparc I", }, /* SS-4 */ { @@ -1240,7 +1229,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss4_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - .default_cpu_model =3D "Fujitsu MB86904", }, /* SPARCClassic */ { @@ -1264,7 +1252,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D scls_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - .default_cpu_model =3D "TI MicroSparc I", }, /* SPARCbook */ { @@ -1288,7 +1275,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D sbook_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - .default_cpu_model =3D "TI MicroSparc I", }, }; =20 @@ -1355,6 +1341,7 @@ static void ss5_class_init(ObjectClass *oc, void *dat= a) mc->block_default_type =3D IF_SCSI; mc->is_default =3D 1; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); } =20 static const TypeInfo ss5_type =3D { @@ -1372,6 +1359,7 @@ static void ss10_class_init(ObjectClass *oc, void *da= ta) mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D 4; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); } =20 static const TypeInfo ss10_type =3D { @@ -1389,6 +1377,7 @@ static void ss600mp_class_init(ObjectClass *oc, void = *data) mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D 4; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); } =20 static const TypeInfo ss600mp_type =3D { @@ -1406,6 +1395,7 @@ static void ss20_class_init(ObjectClass *oc, void *da= ta) mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D 4; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); } =20 static const TypeInfo ss20_type =3D { @@ -1422,6 +1412,7 @@ static void voyager_class_init(ObjectClass *oc, void = *data) mc->init =3D vger_init; mc->block_default_type =3D IF_SCSI; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); } =20 static const TypeInfo voyager_type =3D { @@ -1438,6 +1429,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *d= ata) mc->init =3D ss_lx_init; mc->block_default_type =3D IF_SCSI; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); } =20 static const TypeInfo ss_lx_type =3D { @@ -1454,6 +1446,7 @@ static void ss4_class_init(ObjectClass *oc, void *dat= a) mc->init =3D ss4_init; mc->block_default_type =3D IF_SCSI; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); } =20 static const TypeInfo ss4_type =3D { @@ -1470,6 +1463,7 @@ static void scls_class_init(ObjectClass *oc, void *da= ta) mc->init =3D scls_init; mc->block_default_type =3D IF_SCSI; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); } =20 static const TypeInfo scls_type =3D { @@ -1486,6 +1480,7 @@ static void sbook_class_init(ObjectClass *oc, void *d= ata) mc->init =3D sbook_init; mc->block_default_type =3D IF_SCSI; mc->default_boot_order =3D "c"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); } =20 static const TypeInfo sbook_type =3D { --=20 2.13.6