diff mbox series

[v2,33/40] sparc: sparc: use generic cpu_model parsing

Message ID 1507211474-188400-34-git-send-email-imammedo@redhat.com
State New
Headers show
Series generalize parsing of cpu_model (part 2) | expand

Commit Message

Igor Mammedov Oct. 5, 2017, 1:51 p.m. UTC 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
CC: mark.cave-ayland@ilande.co.uk
CC: atar4qemu@gmail.com
---
 hw/sparc/sun4m.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

Comments

Artyom Tarasenko Oct. 5, 2017, 2:27 p.m. UTC | #1 
On Thu, Oct 5, 2017 at 3:51 PM, Igor Mammedov <imammedo@redhat.com> wrote:
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>

> ---
> CC: mark.cave-ayland@ilande.co.uk
> CC: atar4qemu@gmail.com
> ---
>  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 e1bdd48..68b2378 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 = {
>      .class_init    = ram_class_init,
>  };
>
> -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;
>
> -    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
> +    cpu = SPARC_CPU(cpu_create(cpu_type));
>      env = &cpu->env;
>
>      cpu_sparc_set_id(env, id);
> @@ -820,7 +819,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
>                            MachineState *machine)
>  {
>      DeviceState *slavio_intctl;
> -    const char *cpu_model = 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 *hwdef,
>      unsigned int num_vsimms;
>
>      /* init CPUs */
> -    if (!cpu_model)
> -        cpu_model = hwdef->default_cpu_model;
> -
>      for(i = 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]);
>      }
>
>      for (i = smp_cpus; i < MAX_CPUS; i++)
> @@ -1074,7 +1069,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss5_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "Fujitsu MB86904",
>      },
>      /* SS-10 */
>      {
> @@ -1100,7 +1094,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss10_id,
>          .iommu_version = 0x03000000,
>          .max_mem = 0xf00000000ULL,
> -        .default_cpu_model = "TI SuperSparc II",
>      },
>      /* SS-600MP */
>      {
> @@ -1124,7 +1117,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss600mp_id,
>          .iommu_version = 0x01000000,
>          .max_mem = 0xf00000000ULL,
> -        .default_cpu_model = "TI SuperSparc II",
>      },
>      /* SS-20 */
>      {
> @@ -1166,7 +1158,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss20_id,
>          .iommu_version = 0x13000000,
>          .max_mem = 0xf00000000ULL,
> -        .default_cpu_model = "TI SuperSparc II",
>      },
>      /* Voyager */
>      {
> @@ -1190,7 +1181,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = vger_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "Fujitsu MB86904",
>      },
>      /* LX */
>      {
> @@ -1215,7 +1205,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = lx_id,
>          .iommu_version = 0x04000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "TI MicroSparc I",
>      },
>      /* SS-4 */
>      {
> @@ -1240,7 +1229,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss4_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "Fujitsu MB86904",
>      },
>      /* SPARCClassic */
>      {
> @@ -1264,7 +1252,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = scls_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "TI MicroSparc I",
>      },
>      /* SPARCbook */
>      {
> @@ -1288,7 +1275,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = sbook_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "TI MicroSparc I",
>      },
>  };
>
> @@ -1355,6 +1341,7 @@ static void ss5_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->is_default = 1;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
>  }
>
>  static const TypeInfo ss5_type = {
> @@ -1372,6 +1359,7 @@ static void ss10_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
>  }
>
>  static const TypeInfo ss10_type = {
> @@ -1389,6 +1377,7 @@ static void ss600mp_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
>  }
>
>  static const TypeInfo ss600mp_type = {
> @@ -1406,6 +1395,7 @@ static void ss20_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
>  }
>
>  static const TypeInfo ss20_type = {
> @@ -1422,6 +1412,7 @@ static void voyager_class_init(ObjectClass *oc, void *data)
>      mc->init = vger_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
>  }
>
>  static const TypeInfo voyager_type = {
> @@ -1438,6 +1429,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *data)
>      mc->init = ss_lx_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
>  }
>
>  static const TypeInfo ss_lx_type = {
> @@ -1454,6 +1446,7 @@ static void ss4_class_init(ObjectClass *oc, void *data)
>      mc->init = ss4_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
>  }
>
>  static const TypeInfo ss4_type = {
> @@ -1470,6 +1463,7 @@ static void scls_class_init(ObjectClass *oc, void *data)
>      mc->init = scls_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
>  }
>
>  static const TypeInfo scls_type = {
> @@ -1486,6 +1480,7 @@ static void sbook_class_init(ObjectClass *oc, void *data)
>      mc->init = sbook_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
>  }
>
>  static const TypeInfo sbook_type = {
> --
> 2.7.4
>
Mark Cave-Ayland Oct. 5, 2017, 5:25 p.m. UTC | #2 
On 05/10/17 14:51, Igor Mammedov wrote:

> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> CC: mark.cave-ayland@ilande.co.uk
> CC: atar4qemu@gmail.com
> ---
>  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 e1bdd48..68b2378 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 = {
>      .class_init    = ram_class_init,
>  };
>  
> -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;
>  
> -    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
> +    cpu = SPARC_CPU(cpu_create(cpu_type));
>      env = &cpu->env;
>  
>      cpu_sparc_set_id(env, id);
> @@ -820,7 +819,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
>                            MachineState *machine)
>  {
>      DeviceState *slavio_intctl;
> -    const char *cpu_model = 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 *hwdef,
>      unsigned int num_vsimms;
>  
>      /* init CPUs */
> -    if (!cpu_model)
> -        cpu_model = hwdef->default_cpu_model;
> -
>      for(i = 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]);
>      }
>  
>      for (i = smp_cpus; i < MAX_CPUS; i++)
> @@ -1074,7 +1069,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss5_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "Fujitsu MB86904",
>      },
>      /* SS-10 */
>      {
> @@ -1100,7 +1094,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss10_id,
>          .iommu_version = 0x03000000,
>          .max_mem = 0xf00000000ULL,
> -        .default_cpu_model = "TI SuperSparc II",
>      },
>      /* SS-600MP */
>      {
> @@ -1124,7 +1117,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss600mp_id,
>          .iommu_version = 0x01000000,
>          .max_mem = 0xf00000000ULL,
> -        .default_cpu_model = "TI SuperSparc II",
>      },
>      /* SS-20 */
>      {
> @@ -1166,7 +1158,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss20_id,
>          .iommu_version = 0x13000000,
>          .max_mem = 0xf00000000ULL,
> -        .default_cpu_model = "TI SuperSparc II",
>      },
>      /* Voyager */
>      {
> @@ -1190,7 +1181,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = vger_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "Fujitsu MB86904",
>      },
>      /* LX */
>      {
> @@ -1215,7 +1205,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = lx_id,
>          .iommu_version = 0x04000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "TI MicroSparc I",
>      },
>      /* SS-4 */
>      {
> @@ -1240,7 +1229,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = ss4_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "Fujitsu MB86904",
>      },
>      /* SPARCClassic */
>      {
> @@ -1264,7 +1252,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = scls_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "TI MicroSparc I",
>      },
>      /* SPARCbook */
>      {
> @@ -1288,7 +1275,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
>          .machine_id = sbook_id,
>          .iommu_version = 0x05000000,
>          .max_mem = 0x10000000,
> -        .default_cpu_model = "TI MicroSparc I",
>      },
>  };
>  
> @@ -1355,6 +1341,7 @@ static void ss5_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->is_default = 1;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
>  }
>  
>  static const TypeInfo ss5_type = {
> @@ -1372,6 +1359,7 @@ static void ss10_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
>  }
>  
>  static const TypeInfo ss10_type = {
> @@ -1389,6 +1377,7 @@ static void ss600mp_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
>  }
>  
>  static const TypeInfo ss600mp_type = {
> @@ -1406,6 +1395,7 @@ static void ss20_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
>  }
>  
>  static const TypeInfo ss20_type = {
> @@ -1422,6 +1412,7 @@ static void voyager_class_init(ObjectClass *oc, void *data)
>      mc->init = vger_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
>  }
>  
>  static const TypeInfo voyager_type = {
> @@ -1438,6 +1429,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *data)
>      mc->init = ss_lx_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
>  }
>  
>  static const TypeInfo ss_lx_type = {
> @@ -1454,6 +1446,7 @@ static void ss4_class_init(ObjectClass *oc, void *data)
>      mc->init = ss4_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
>  }
>  
>  static const TypeInfo ss4_type = {
> @@ -1470,6 +1463,7 @@ static void scls_class_init(ObjectClass *oc, void *data)
>      mc->init = scls_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
>  }
>  
>  static const TypeInfo scls_type = {
> @@ -1486,6 +1480,7 @@ static void sbook_class_init(ObjectClass *oc, void *data)
>      mc->init = sbook_init;
>      mc->block_default_type = IF_SCSI;
>      mc->default_boot_order = "c";
> +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
>  }
>  
>  static const TypeInfo sbook_type = {

No objections to this patch but just to confirm from the previous
discussion that the cpu type gets parsed in a way such that an existing
-cpu "TI SuperSparc II" option gets mapped to the correct
"TI-SuperSparc-II" type? Presumably this is now handled at a different
level?


ATB,

Mark.
Igor Mammedov Oct. 6, 2017, 7:37 a.m. UTC | #3 
On Thu, 5 Oct 2017 18:25:04 +0100
Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> wrote:

> On 05/10/17 14:51, Igor Mammedov wrote:
> 
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > CC: mark.cave-ayland@ilande.co.uk
> > CC: atar4qemu@gmail.com
> > ---
> >  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 e1bdd48..68b2378 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 = {
> >      .class_init    = ram_class_init,
> >  };
> >  
> > -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;
> >  
> > -    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
> > +    cpu = SPARC_CPU(cpu_create(cpu_type));
> >      env = &cpu->env;
> >  
> >      cpu_sparc_set_id(env, id);
> > @@ -820,7 +819,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
> >                            MachineState *machine)
> >  {
> >      DeviceState *slavio_intctl;
> > -    const char *cpu_model = 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 *hwdef,
> >      unsigned int num_vsimms;
> >  
> >      /* init CPUs */
> > -    if (!cpu_model)
> > -        cpu_model = hwdef->default_cpu_model;
> > -
> >      for(i = 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]);
> >      }
> >  
> >      for (i = smp_cpus; i < MAX_CPUS; i++)
> > @@ -1074,7 +1069,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = ss5_id,
> >          .iommu_version = 0x05000000,
> >          .max_mem = 0x10000000,
> > -        .default_cpu_model = "Fujitsu MB86904",
> >      },
> >      /* SS-10 */
> >      {
> > @@ -1100,7 +1094,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = ss10_id,
> >          .iommu_version = 0x03000000,
> >          .max_mem = 0xf00000000ULL,
> > -        .default_cpu_model = "TI SuperSparc II",
> >      },
> >      /* SS-600MP */
> >      {
> > @@ -1124,7 +1117,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = ss600mp_id,
> >          .iommu_version = 0x01000000,
> >          .max_mem = 0xf00000000ULL,
> > -        .default_cpu_model = "TI SuperSparc II",
> >      },
> >      /* SS-20 */
> >      {
> > @@ -1166,7 +1158,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = ss20_id,
> >          .iommu_version = 0x13000000,
> >          .max_mem = 0xf00000000ULL,
> > -        .default_cpu_model = "TI SuperSparc II",
> >      },
> >      /* Voyager */
> >      {
> > @@ -1190,7 +1181,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = vger_id,
> >          .iommu_version = 0x05000000,
> >          .max_mem = 0x10000000,
> > -        .default_cpu_model = "Fujitsu MB86904",
> >      },
> >      /* LX */
> >      {
> > @@ -1215,7 +1205,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = lx_id,
> >          .iommu_version = 0x04000000,
> >          .max_mem = 0x10000000,
> > -        .default_cpu_model = "TI MicroSparc I",
> >      },
> >      /* SS-4 */
> >      {
> > @@ -1240,7 +1229,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = ss4_id,
> >          .iommu_version = 0x05000000,
> >          .max_mem = 0x10000000,
> > -        .default_cpu_model = "Fujitsu MB86904",
> >      },
> >      /* SPARCClassic */
> >      {
> > @@ -1264,7 +1252,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = scls_id,
> >          .iommu_version = 0x05000000,
> >          .max_mem = 0x10000000,
> > -        .default_cpu_model = "TI MicroSparc I",
> >      },
> >      /* SPARCbook */
> >      {
> > @@ -1288,7 +1275,6 @@ static const struct sun4m_hwdef sun4m_hwdefs[] = {
> >          .machine_id = sbook_id,
> >          .iommu_version = 0x05000000,
> >          .max_mem = 0x10000000,
> > -        .default_cpu_model = "TI MicroSparc I",
> >      },
> >  };
> >  
> > @@ -1355,6 +1341,7 @@ static void ss5_class_init(ObjectClass *oc, void *data)
> >      mc->block_default_type = IF_SCSI;
> >      mc->is_default = 1;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
> >  }
> >  
> >  static const TypeInfo ss5_type = {
> > @@ -1372,6 +1359,7 @@ static void ss10_class_init(ObjectClass *oc, void *data)
> >      mc->block_default_type = IF_SCSI;
> >      mc->max_cpus = 4;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
> >  }
> >  
> >  static const TypeInfo ss10_type = {
> > @@ -1389,6 +1377,7 @@ static void ss600mp_class_init(ObjectClass *oc, void *data)
> >      mc->block_default_type = IF_SCSI;
> >      mc->max_cpus = 4;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
> >  }
> >  
> >  static const TypeInfo ss600mp_type = {
> > @@ -1406,6 +1395,7 @@ static void ss20_class_init(ObjectClass *oc, void *data)
> >      mc->block_default_type = IF_SCSI;
> >      mc->max_cpus = 4;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
> >  }
> >  
> >  static const TypeInfo ss20_type = {
> > @@ -1422,6 +1412,7 @@ static void voyager_class_init(ObjectClass *oc, void *data)
> >      mc->init = vger_init;
> >      mc->block_default_type = IF_SCSI;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
> >  }
> >  
> >  static const TypeInfo voyager_type = {
> > @@ -1438,6 +1429,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *data)
> >      mc->init = ss_lx_init;
> >      mc->block_default_type = IF_SCSI;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
> >  }
> >  
> >  static const TypeInfo ss_lx_type = {
> > @@ -1454,6 +1446,7 @@ static void ss4_class_init(ObjectClass *oc, void *data)
> >      mc->init = ss4_init;
> >      mc->block_default_type = IF_SCSI;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
> >  }
> >  
> >  static const TypeInfo ss4_type = {
> > @@ -1470,6 +1463,7 @@ static void scls_class_init(ObjectClass *oc, void *data)
> >      mc->init = scls_init;
> >      mc->block_default_type = IF_SCSI;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
> >  }
> >  
> >  static const TypeInfo scls_type = {
> > @@ -1486,6 +1480,7 @@ static void sbook_class_init(ObjectClass *oc, void *data)
> >      mc->init = sbook_init;
> >      mc->block_default_type = IF_SCSI;
> >      mc->default_boot_order = "c";
> > +    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
> >  }
> >  
> >  static const TypeInfo sbook_type = {  
> 
> No objections to this patch but just to confirm from the previous
> discussion that the cpu type gets parsed in a way such that an existing
> -cpu "TI SuperSparc II" option gets mapped to the correct
> "TI-SuperSparc-II" type? Presumably this is now handled at a different
> level?
old way still works, see sparc_cpu_type_name()

call chain is
 vl.c:
   machine->cpu_type = cpu_parse_cpu_model()
                          -> sparc_cpu_class_by_name()
                               -> sparc_cpu_type_name()
   
> 
> 
> ATB,
> 
> Mark.
>
Mark Cave-Ayland Oct. 6, 2017, 11:17 a.m. UTC | #4 
On 06/10/17 08:37, Igor Mammedov wrote:

>> No objections to this patch but just to confirm from the previous
>> discussion that the cpu type gets parsed in a way such that an existing
>> -cpu "TI SuperSparc II" option gets mapped to the correct
>> "TI-SuperSparc-II" type? Presumably this is now handled at a different
>> level?
> old way still works, see sparc_cpu_type_name()
> 
> call chain is
>  vl.c:
>    machine->cpu_type = cpu_parse_cpu_model()
>                           -> sparc_cpu_class_by_name()
>                                -> sparc_cpu_type_name()

Yeah, that's what I was fairly sure the outcome was but couldn't quite
see it in that patchset. In that case:

Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.
diff mbox series

Patch

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index e1bdd48..68b2378 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 = {
     .class_init    = ram_class_init,
 };
 
-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;
 
-    cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
+    cpu = SPARC_CPU(cpu_create(cpu_type));
     env = &cpu->env;
 
     cpu_sparc_set_id(env, id);
@@ -820,7 +819,6 @@  static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
                           MachineState *machine)
 {
     DeviceState *slavio_intctl;
-    const char *cpu_model = 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 *hwdef,
     unsigned int num_vsimms;
 
     /* init CPUs */
-    if (!cpu_model)
-        cpu_model = hwdef->default_cpu_model;
-
     for(i = 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]);
     }
 
     for (i = smp_cpus; i < MAX_CPUS; i++)
@@ -1074,7 +1069,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = ss5_id,
         .iommu_version = 0x05000000,
         .max_mem = 0x10000000,
-        .default_cpu_model = "Fujitsu MB86904",
     },
     /* SS-10 */
     {
@@ -1100,7 +1094,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = ss10_id,
         .iommu_version = 0x03000000,
         .max_mem = 0xf00000000ULL,
-        .default_cpu_model = "TI SuperSparc II",
     },
     /* SS-600MP */
     {
@@ -1124,7 +1117,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = ss600mp_id,
         .iommu_version = 0x01000000,
         .max_mem = 0xf00000000ULL,
-        .default_cpu_model = "TI SuperSparc II",
     },
     /* SS-20 */
     {
@@ -1166,7 +1158,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = ss20_id,
         .iommu_version = 0x13000000,
         .max_mem = 0xf00000000ULL,
-        .default_cpu_model = "TI SuperSparc II",
     },
     /* Voyager */
     {
@@ -1190,7 +1181,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = vger_id,
         .iommu_version = 0x05000000,
         .max_mem = 0x10000000,
-        .default_cpu_model = "Fujitsu MB86904",
     },
     /* LX */
     {
@@ -1215,7 +1205,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = lx_id,
         .iommu_version = 0x04000000,
         .max_mem = 0x10000000,
-        .default_cpu_model = "TI MicroSparc I",
     },
     /* SS-4 */
     {
@@ -1240,7 +1229,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = ss4_id,
         .iommu_version = 0x05000000,
         .max_mem = 0x10000000,
-        .default_cpu_model = "Fujitsu MB86904",
     },
     /* SPARCClassic */
     {
@@ -1264,7 +1252,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = scls_id,
         .iommu_version = 0x05000000,
         .max_mem = 0x10000000,
-        .default_cpu_model = "TI MicroSparc I",
     },
     /* SPARCbook */
     {
@@ -1288,7 +1275,6 @@  static const struct sun4m_hwdef sun4m_hwdefs[] = {
         .machine_id = sbook_id,
         .iommu_version = 0x05000000,
         .max_mem = 0x10000000,
-        .default_cpu_model = "TI MicroSparc I",
     },
 };
 
@@ -1355,6 +1341,7 @@  static void ss5_class_init(ObjectClass *oc, void *data)
     mc->block_default_type = IF_SCSI;
     mc->is_default = 1;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
 }
 
 static const TypeInfo ss5_type = {
@@ -1372,6 +1359,7 @@  static void ss10_class_init(ObjectClass *oc, void *data)
     mc->block_default_type = IF_SCSI;
     mc->max_cpus = 4;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
 }
 
 static const TypeInfo ss10_type = {
@@ -1389,6 +1377,7 @@  static void ss600mp_class_init(ObjectClass *oc, void *data)
     mc->block_default_type = IF_SCSI;
     mc->max_cpus = 4;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
 }
 
 static const TypeInfo ss600mp_type = {
@@ -1406,6 +1395,7 @@  static void ss20_class_init(ObjectClass *oc, void *data)
     mc->block_default_type = IF_SCSI;
     mc->max_cpus = 4;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-SuperSparc-II");
 }
 
 static const TypeInfo ss20_type = {
@@ -1422,6 +1412,7 @@  static void voyager_class_init(ObjectClass *oc, void *data)
     mc->init = vger_init;
     mc->block_default_type = IF_SCSI;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
 }
 
 static const TypeInfo voyager_type = {
@@ -1438,6 +1429,7 @@  static void ss_lx_class_init(ObjectClass *oc, void *data)
     mc->init = ss_lx_init;
     mc->block_default_type = IF_SCSI;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
 }
 
 static const TypeInfo ss_lx_type = {
@@ -1454,6 +1446,7 @@  static void ss4_class_init(ObjectClass *oc, void *data)
     mc->init = ss4_init;
     mc->block_default_type = IF_SCSI;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Fujitsu-MB86904");
 }
 
 static const TypeInfo ss4_type = {
@@ -1470,6 +1463,7 @@  static void scls_class_init(ObjectClass *oc, void *data)
     mc->init = scls_init;
     mc->block_default_type = IF_SCSI;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
 }
 
 static const TypeInfo scls_type = {
@@ -1486,6 +1480,7 @@  static void sbook_class_init(ObjectClass *oc, void *data)
     mc->init = sbook_init;
     mc->block_default_type = IF_SCSI;
     mc->default_boot_order = "c";
+    mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-MicroSparc-I");
 }
 
 static const TypeInfo sbook_type = {