All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alistair Francis <alistair23@gmail.com>
To: Igor Mammedov <imammedo@redhat.com>
Cc: "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH v2 5/5] arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly
Date: Thu, 14 Sep 2017 10:57:20 -0700	[thread overview]
Message-ID: <CAKmqyKPF=KnePCTefLEA1PkCquThchLcm2mDR_C4oaVhbi1sXA@mail.gmail.com> (raw)
In-Reply-To: <1505318697-77161-6-git-send-email-imammedo@redhat.com>

On Wed, Sep 13, 2017 at 9:04 AM, Igor Mammedov <imammedo@redhat.com> wrote:
> there are 2 use cases to deal with:
>   1: fixed CPU models per board/soc
>   2: boards with user configurable cpu_model and fallback to
>      default cpu_model if user hasn't specified one explicitly
>
> For the 1st
>   drop intermediate cpu_model parsing and use const cpu type
>   directly, which replaces:
>      typename = object_class_get_name(
>            cpu_class_by_name(TYPE_ARM_CPU, cpu_model))
>      object_new(typename)
>   with
>      object_new(FOO_CPU_TYPE_NAME)
>   or
>      cpu_generic_init(BASE_CPU_TYPE, "my cpu model")
>   with
>      cpu_create(FOO_CPU_TYPE_NAME)
>
> as result 1st use case doesn't have to invoke not necessary
> translation and not needed code is removed.
>
> For the 2nd
>  1: set default cpu type with MachineClass::default_cpu_type and
>  2: use generic cpu_model parsing that done before machine_init()
>     is run and:
>     2.1: drop custom cpu_model parsing where pattern is:
>        typename = object_class_get_name(
>            cpu_class_by_name(TYPE_ARM_CPU, cpu_model))
>        [parse_features(typename, cpu_model, &err) ]
>
>     2.2: or replace cpu_generic_init() which does what
>          2.1 does + create_cpu(typename) with just
>          create_cpu(machine->cpu_type)
> as result cpu_name -> cpu_type translation is done using
> generic machine code one including parsing optional features
> if supported/present (removes a bunch of duplicated cpu_model
> parsing code) and default cpu type is defined in an uniform way
> within machine_class_init callbacks instead of adhoc places
> in boadr's machine_init code.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

Fox the Xilinx and Netduino stuff:

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Thanks,
Alistair

> ---
> v2:
>  - fix merge conflicts with ignore_memory_transaction_failures
>  - fix couple merge conflicts where SoC type string where replaced by type macro
>  - keep plain prefix string in: strncmp(cpu_type, "pxa27", 5)
>  - s/"%s" ARM_CPU_TYPE_SUFFIX/ARM_CPU_TYPE_NAME("%s")/
> ---
>  include/hw/arm/armv7m.h        |  2 +-
>  include/hw/arm/aspeed_soc.h    |  2 +-
>  include/hw/arm/stm32f205_soc.h |  2 +-
>  target/arm/cpu.h               |  3 +++
>  hw/arm/armv7m.c                | 40 +++++-------------------------------
>  hw/arm/aspeed_soc.c            | 13 +++++-------
>  hw/arm/collie.c                | 10 +++------
>  hw/arm/exynos4210.c            |  6 +-----
>  hw/arm/gumstix.c               |  5 +++--
>  hw/arm/highbank.c              | 10 ++++-----
>  hw/arm/integratorcp.c          | 30 ++-------------------------
>  hw/arm/mainstone.c             |  9 ++++-----
>  hw/arm/mps2.c                  | 17 +++++++---------
>  hw/arm/musicpal.c              |  7 ++-----
>  hw/arm/netduino2.c             |  2 +-
>  hw/arm/nseries.c               |  4 +++-
>  hw/arm/omap1.c                 |  7 ++-----
>  hw/arm/omap2.c                 |  4 ++--
>  hw/arm/omap_sx1.c              |  5 ++++-
>  hw/arm/palm.c                  |  5 +++--
>  hw/arm/pxa2xx.c                | 10 ++++-----
>  hw/arm/realview.c              | 25 +++++------------------
>  hw/arm/spitz.c                 | 12 ++++++-----
>  hw/arm/stellaris.c             | 16 +++++++--------
>  hw/arm/stm32f205_soc.c         |  4 ++--
>  hw/arm/strongarm.c             | 10 +++------
>  hw/arm/tosa.c                  |  4 ----
>  hw/arm/versatilepb.c           | 15 +++-----------
>  hw/arm/vexpress.c              | 32 +++++++++--------------------
>  hw/arm/virt.c                  | 46 +++++++++---------------------------------
>  hw/arm/xilinx_zynq.c           | 10 ++-------
>  hw/arm/z2.c                    |  9 +++------
>  target/arm/cpu.c               |  2 +-
>  33 files changed, 114 insertions(+), 264 deletions(-)
>
> diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h
> index 10eb058..68cb30d 100644
> --- a/include/hw/arm/armv7m.h
> +++ b/include/hw/arm/armv7m.h
> @@ -55,7 +55,7 @@ typedef struct ARMv7MState {
>      MemoryRegion container;
>
>      /* Properties */
> -    char *cpu_model;
> +    char *cpu_type;
>      /* MemoryRegion the board provides to us (with its devices, RAM, etc) */
>      MemoryRegion *board_memory;
>  } ARMv7MState;
> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> index 0b88baa..f26914a 100644
> --- a/include/hw/arm/aspeed_soc.h
> +++ b/include/hw/arm/aspeed_soc.h
> @@ -49,7 +49,7 @@ typedef struct AspeedSoCState {
>
>  typedef struct AspeedSoCInfo {
>      const char *name;
> -    const char *cpu_model;
> +    const char *cpu_type;
>      uint32_t silicon_rev;
>      hwaddr sdram_base;
>      uint64_t sram_size;
> diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h
> index e2dce11..922a733 100644
> --- a/include/hw/arm/stm32f205_soc.h
> +++ b/include/hw/arm/stm32f205_soc.h
> @@ -52,7 +52,7 @@ typedef struct STM32F205State {
>      SysBusDevice parent_obj;
>      /*< public >*/
>
> -    char *cpu_model;
> +    char *cpu_type;
>
>      ARMv7MState armv7m;
>
> diff --git a/target/arm/cpu.h b/target/arm/cpu.h
> index 98b9b26..1bfdd8d 100644
> --- a/target/arm/cpu.h
> +++ b/target/arm/cpu.h
> @@ -2088,6 +2088,9 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
>
>  #define cpu_init(cpu_model) cpu_generic_init(TYPE_ARM_CPU, cpu_model)
>
> +#define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU
> +#define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX)
> +
>  #define cpu_signal_handler cpu_arm_signal_handler
>  #define cpu_list arm_cpu_list
>
> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
> index b64a409..57a6806 100644
> --- a/hw/arm/armv7m.c
> +++ b/hw/arm/armv7m.c
> @@ -151,10 +151,6 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
>      SysBusDevice *sbd;
>      Error *err = NULL;
>      int i;
> -    char **cpustr;
> -    ObjectClass *oc;
> -    const char *typename;
> -    CPUClass *cc;
>
>      if (!s->board_memory) {
>          error_setg(errp, "memory property was not set");
> @@ -163,29 +159,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
>
>      memory_region_add_subregion_overlap(&s->container, 0, s->board_memory, -1);
>
> -    cpustr = g_strsplit(s->cpu_model, ",", 2);
> -
> -    oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);
> -    if (!oc) {
> -        error_setg(errp, "Unknown CPU model %s", cpustr[0]);
> -        g_strfreev(cpustr);
> -        return;
> -    }
> -
> -    cc = CPU_CLASS(oc);
> -    typename = object_class_get_name(oc);
> -    cc->parse_features(typename, cpustr[1], &err);
> -    g_strfreev(cpustr);
> -    if (err) {
> -        error_propagate(errp, err);
> -        return;
> -    }
> -
> -    s->cpu = ARM_CPU(object_new(typename));
> -    if (!s->cpu) {
> -        error_setg(errp, "Unknown CPU model %s", s->cpu_model);
> -        return;
> -    }
> +    s->cpu = ARM_CPU(object_new(s->cpu_type));
>
>      object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",
>                               &error_abort);
> @@ -241,7 +215,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
>  }
>
>  static Property armv7m_properties[] = {
> -    DEFINE_PROP_STRING("cpu-model", ARMv7MState, cpu_model),
> +    DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type),
>      DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
>                       MemoryRegion *),
>      DEFINE_PROP_END_OF_LIST(),
> @@ -275,20 +249,16 @@ static void armv7m_reset(void *opaque)
>     Returns the ARMv7M device.  */
>
>  DeviceState *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
> -                      const char *kernel_filename, const char *cpu_model)
> +                         const char *kernel_filename, const char *cpu_type)
>  {
>      DeviceState *armv7m;
>
> -    if (cpu_model == NULL) {
> -        cpu_model = "cortex-m3";
> -    }
> -
>      armv7m = qdev_create(NULL, TYPE_ARMV7M);
>      qdev_prop_set_uint32(armv7m, "num-irq", num_irq);
> -    qdev_prop_set_string(armv7m, "cpu-model", cpu_model);
> +    qdev_prop_set_string(armv7m, "cpu-type", cpu_type);
>      object_property_set_link(OBJECT(armv7m), OBJECT(get_system_memory()),
>                                       "memory", &error_abort);
> -    /* This will exit with an error if the user passed us a bad cpu_model */
> +    /* This will exit with an error if the user passed us a bad cpu_type */
>      qdev_init_nofail(armv7m);
>
>      armv7m_load_kernel(ARM_CPU(first_cpu), kernel_filename, mem_size);
> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
> index 13c6393..5aa3d2d 100644
> --- a/hw/arm/aspeed_soc.c
> +++ b/hw/arm/aspeed_soc.c
> @@ -54,7 +54,7 @@ static const char *aspeed_soc_ast2500_typenames[] = {
>  static const AspeedSoCInfo aspeed_socs[] = {
>      {
>          .name         = "ast2400-a0",
> -        .cpu_model    = "arm926",
> +        .cpu_type     = ARM_CPU_TYPE_NAME("arm926"),
>          .silicon_rev  = AST2400_A0_SILICON_REV,
>          .sdram_base   = AST2400_SDRAM_BASE,
>          .sram_size    = 0x8000,
> @@ -65,7 +65,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>          .wdts_num     = 2,
>      }, {
>          .name         = "ast2400-a1",
> -        .cpu_model    = "arm926",
> +        .cpu_type     = ARM_CPU_TYPE_NAME("arm926"),
>          .silicon_rev  = AST2400_A1_SILICON_REV,
>          .sdram_base   = AST2400_SDRAM_BASE,
>          .sram_size    = 0x8000,
> @@ -76,7 +76,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>          .wdts_num     = 2,
>      }, {
>          .name         = "ast2400",
> -        .cpu_model    = "arm926",
> +        .cpu_type     = ARM_CPU_TYPE_NAME("arm926"),
>          .silicon_rev  = AST2400_A0_SILICON_REV,
>          .sdram_base   = AST2400_SDRAM_BASE,
>          .sram_size    = 0x8000,
> @@ -87,7 +87,7 @@ static const AspeedSoCInfo aspeed_socs[] = {
>          .wdts_num     = 2,
>      }, {
>          .name         = "ast2500-a1",
> -        .cpu_model    = "arm1176",
> +        .cpu_type     = ARM_CPU_TYPE_NAME("arm1176"),
>          .silicon_rev  = AST2500_A1_SILICON_REV,
>          .sdram_base   = AST2500_SDRAM_BASE,
>          .sram_size    = 0x9000,
> @@ -128,13 +128,10 @@ static void aspeed_soc_init(Object *obj)
>  {
>      AspeedSoCState *s = ASPEED_SOC(obj);
>      AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
> -    char *cpu_typename;
>      int i;
>
> -    cpu_typename = g_strdup_printf("%s-" TYPE_ARM_CPU, sc->info->cpu_model);
> -    object_initialize(&s->cpu, sizeof(s->cpu), cpu_typename);
> +    object_initialize(&s->cpu, sizeof(s->cpu), sc->info->cpu_type);
>      object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL);
> -    g_free(cpu_typename);
>
>      object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC);
>      object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL);
> diff --git a/hw/arm/collie.c b/hw/arm/collie.c
> index 8830192..f8c566e 100644
> --- a/hw/arm/collie.c
> +++ b/hw/arm/collie.c
> @@ -18,7 +18,7 @@
>  #include "hw/block/flash.h"
>  #include "sysemu/block-backend.h"
>  #include "exec/address-spaces.h"
> -#include "qom/cpu.h"
> +#include "cpu.h"
>
>  static struct arm_boot_info collie_binfo = {
>      .loader_start = SA_SDCS0,
> @@ -27,7 +27,6 @@ static struct arm_boot_info collie_binfo = {
>
>  static void collie_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> @@ -35,11 +34,7 @@ static void collie_init(MachineState *machine)
>      DriveInfo *dinfo;
>      MemoryRegion *sysmem = get_system_memory();
>
> -    if (!cpu_model) {
> -        cpu_model = "sa1110";
> -    }
> -
> -    s = sa1110_init(sysmem, collie_binfo.ram_size, cpu_model);
> +    s = sa1110_init(sysmem, collie_binfo.ram_size, machine->cpu_type);
>
>      dinfo = drive_get(IF_PFLASH, 0, 0);
>      pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
> @@ -65,6 +60,7 @@ static void collie_machine_init(MachineClass *mc)
>      mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)";
>      mc->init = collie_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
>  }
>
>  DEFINE_MACHINE("collie", collie_machine_init)
> diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
> index ee1438a..e8e1d81 100644
> --- a/hw/arm/exynos4210.c
> +++ b/hw/arm/exynos4210.c
> @@ -169,15 +169,11 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem)
>      Exynos4210State *s = g_new(Exynos4210State, 1);
>      qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS];
>      SysBusDevice *busdev;
> -    ObjectClass *cpu_oc;
>      DeviceState *dev;
>      int i, n;
>
> -    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, "cortex-a9");
> -    assert(cpu_oc);
> -
>      for (n = 0; n < EXYNOS4210_NCPUS; n++) {
> -        Object *cpuobj = object_new(object_class_get_name(cpu_oc));
> +        Object *cpuobj = object_new(ARM_CPU_TYPE_NAME("cortex-a9"));
>
>          /* By default A9 CPUs have EL3 enabled.  This board does not currently
>           * support EL3 so the CPU EL3 property is disabled before realization.
> diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
> index 092ce36..bba9e9f 100644
> --- a/hw/arm/gumstix.c
> +++ b/hw/arm/gumstix.c
> @@ -44,6 +44,7 @@
>  #include "sysemu/block-backend.h"
>  #include "exec/address-spaces.h"
>  #include "sysemu/qtest.h"
> +#include "cpu.h"
>
>  static const int sector_len = 128 * 1024;
>
> @@ -86,7 +87,6 @@ static void connex_init(MachineState *machine)
>
>  static void verdex_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
>      PXA2xxState *cpu;
>      DriveInfo *dinfo;
>      int be;
> @@ -95,7 +95,7 @@ static void verdex_init(MachineState *machine)
>      uint32_t verdex_rom = 0x02000000;
>      uint32_t verdex_ram = 0x10000000;
>
> -    cpu = pxa270_init(address_space_mem, verdex_ram, cpu_model ?: "pxa270-c0");
> +    cpu = pxa270_init(address_space_mem, verdex_ram, machine->cpu_type);
>
>      dinfo = drive_get(IF_PFLASH, 0, 0);
>      if (!dinfo && !qtest_enabled()) {
> @@ -144,6 +144,7 @@ static void verdex_class_init(ObjectClass *oc, void *data)
>      mc->desc = "Gumstix Verdex (PXA270)";
>      mc->init = verdex_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c0");
>  }
>
>  static const TypeInfo verdex_type = {
> diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
> index ba27789..354c6b2 100644
> --- a/hw/arm/highbank.c
> +++ b/hw/arm/highbank.c
> @@ -222,7 +222,6 @@ enum cxmachines {
>  static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
>  {
>      ram_addr_t ram_size = machine->ram_size;
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> @@ -239,19 +238,20 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
>
>      switch (machine_id) {
>      case CALXEDA_HIGHBANK:
> -        cpu_model = "cortex-a9";
> +        machine->cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
>          break;
>      case CALXEDA_MIDWAY:
> -        cpu_model = "cortex-a15";
> +        machine->cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
>          break;
> +    default:
> +        assert(0);
>      }
>
>      for (n = 0; n < smp_cpus; n++) {
> -        ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
>          Object *cpuobj;
>          ARMCPU *cpu;
>
> -        cpuobj = object_new(object_class_get_name(oc));
> +        cpuobj = object_new(machine->cpu_type);
>          cpu = ARM_CPU(cpuobj);
>
>          object_property_set_int(cpuobj, QEMU_PSCI_CONDUIT_SMC,
> diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
> index d603af9..e8303b8 100644
> --- a/hw/arm/integratorcp.c
> +++ b/hw/arm/integratorcp.c
> @@ -572,46 +572,19 @@ static struct arm_boot_info integrator_binfo = {
>  static void integratorcp_init(MachineState *machine)
>  {
>      ram_addr_t ram_size = machine->ram_size;
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> -    char **cpustr;
> -    ObjectClass *cpu_oc;
> -    CPUClass *cc;
>      Object *cpuobj;
>      ARMCPU *cpu;
> -    const char *typename;
>      MemoryRegion *address_space_mem = get_system_memory();
>      MemoryRegion *ram = g_new(MemoryRegion, 1);
>      MemoryRegion *ram_alias = g_new(MemoryRegion, 1);
>      qemu_irq pic[32];
>      DeviceState *dev, *sic, *icp;
>      int i;
> -    Error *err = NULL;
>
> -    if (!cpu_model) {
> -        cpu_model = "arm926";
> -    }
> -
> -    cpustr = g_strsplit(cpu_model, ",", 2);
> -
> -    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);
> -    if (!cpu_oc) {
> -        fprintf(stderr, "Unable to find CPU definition\n");
> -        exit(1);
> -    }
> -    typename = object_class_get_name(cpu_oc);
> -
> -    cc = CPU_CLASS(cpu_oc);
> -    cc->parse_features(typename, cpustr[1], &err);
> -    g_strfreev(cpustr);
> -    if (err) {
> -        error_report_err(err);
> -        exit(1);
> -    }
> -
> -    cpuobj = object_new(typename);
> +    cpuobj = object_new(machine->cpu_type);
>
>      /* By default ARM1176 CPUs have EL3 enabled.  This board does not
>       * currently support EL3 so the CPU EL3 property is disabled before
> @@ -682,6 +655,7 @@ static void integratorcp_machine_init(MachineClass *mc)
>      mc->desc = "ARM Integrator/CP (ARM926EJ-S)";
>      mc->init = integratorcp_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>  }
>
>  DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
> diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
> index 637f52c..d07972a 100644
> --- a/hw/arm/mainstone.c
> +++ b/hw/arm/mainstone.c
> @@ -24,6 +24,7 @@
>  #include "hw/sysbus.h"
>  #include "exec/address-spaces.h"
>  #include "sysemu/qtest.h"
> +#include "cpu.h"
>
>  /* Device addresses */
>  #define MST_FPGA_PHYS  0x08000000
> @@ -121,13 +122,10 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
>      int i;
>      int be;
>      MemoryRegion *rom = g_new(MemoryRegion, 1);
> -    const char *cpu_model = machine->cpu_model;
> -
> -    if (!cpu_model)
> -        cpu_model = "pxa270-c5";
>
>      /* Setup CPU & memory */
> -    mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size, cpu_model);
> +    mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size,
> +                      machine->cpu_type);
>      memory_region_init_ram(rom, NULL, "mainstone.rom", MAINSTONE_ROM,
>                             &error_fatal);
>      memory_region_set_readonly(rom, true);
> @@ -197,6 +195,7 @@ static void mainstone2_machine_init(MachineClass *mc)
>      mc->desc = "Mainstone II (PXA27x)";
>      mc->init = mainstone_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c5");
>  }
>
>  DEFINE_MACHINE("mainstone", mainstone2_machine_init)
> diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
> index abb0ab6..aeaad80 100644
> --- a/hw/arm/mps2.c
> +++ b/hw/arm/mps2.c
> @@ -46,7 +46,6 @@ typedef enum MPS2FPGAType {
>  typedef struct {
>      MachineClass parent;
>      MPS2FPGAType fpga_type;
> -    const char *cpu_model;
>      uint32_t scc_id;
>  } MPS2MachineClass;
>
> @@ -107,14 +106,12 @@ static void mps2_common_init(MachineState *machine)
>      MPS2MachineState *mms = MPS2_MACHINE(machine);
>      MPS2MachineClass *mmc = MPS2_MACHINE_GET_CLASS(machine);
>      MemoryRegion *system_memory = get_system_memory();
> +    MachineClass *mc = MACHINE_GET_CLASS(machine);
>      DeviceState *armv7m, *sccdev;
>
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = mmc->cpu_model;
> -    }
> -
> -    if (strcmp(machine->cpu_model, mmc->cpu_model) != 0) {
> -        error_report("This board can only be used with CPU %s", mmc->cpu_model);
> +    if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {
> +        error_report("This board can only be used with CPU %s",
> +                     mc->default_cpu_type);
>          exit(1);
>      }
>
> @@ -188,7 +185,7 @@ static void mps2_common_init(MachineState *machine)
>      default:
>          g_assert_not_reached();
>      }
> -    qdev_prop_set_string(armv7m, "cpu-model", machine->cpu_model);
> +    qdev_prop_set_string(armv7m, "cpu-type", machine->cpu_type);
>      object_property_set_link(OBJECT(&mms->armv7m), OBJECT(system_memory),
>                               "memory", &error_abort);
>      object_property_set_bool(OBJECT(&mms->armv7m), true, "realized",
> @@ -339,7 +336,7 @@ static void mps2_an385_class_init(ObjectClass *oc, void *data)
>
>      mc->desc = "ARM MPS2 with AN385 FPGA image for Cortex-M3";
>      mmc->fpga_type = FPGA_AN385;
> -    mmc->cpu_model = "cortex-m3";
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
>      mmc->scc_id = 0x41040000 | (385 << 4);
>  }
>
> @@ -350,7 +347,7 @@ static void mps2_an511_class_init(ObjectClass *oc, void *data)
>
>      mc->desc = "ARM MPS2 with AN511 DesignStart FPGA image for Cortex-M3";
>      mmc->fpga_type = FPGA_AN511;
> -    mmc->cpu_model = "cortex-m3";
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
>      mmc->scc_id = 0x4104000 | (511 << 4);
>  }
>
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 7a6c0a6..b648770 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1570,7 +1570,6 @@ static struct arm_boot_info musicpal_binfo = {
>
>  static void musicpal_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> @@ -1590,10 +1589,7 @@ static void musicpal_init(MachineState *machine)
>      MemoryRegion *ram = g_new(MemoryRegion, 1);
>      MemoryRegion *sram = g_new(MemoryRegion, 1);
>
> -    if (!cpu_model) {
> -        cpu_model = "arm926";
> -    }
> -    cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
> +    cpu = ARM_CPU(cpu_create(machine->cpu_type));
>
>      /* For now we use a fixed - the original - RAM size */
>      memory_region_allocate_system_memory(ram, NULL, "musicpal.ram",
> @@ -1715,6 +1711,7 @@ static void musicpal_machine_init(MachineClass *mc)
>      mc->desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)";
>      mc->init = musicpal_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>  }
>
>  DEFINE_MACHINE("musicpal", musicpal_machine_init)
> diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
> index 9d34d4c..f936017 100644
> --- a/hw/arm/netduino2.c
> +++ b/hw/arm/netduino2.c
> @@ -34,7 +34,7 @@ static void netduino2_init(MachineState *machine)
>      DeviceState *dev;
>
>      dev = qdev_create(NULL, TYPE_STM32F205_SOC);
> -    qdev_prop_set_string(dev, "cpu-model", "cortex-m3");
> +    qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m3"));
>      object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal);
>
>      armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
> index a32ac82..58005b6 100644
> --- a/hw/arm/nseries.c
> +++ b/hw/arm/nseries.c
> @@ -1310,7 +1310,7 @@ static void n8x0_init(MachineState *machine,
>      struct n800_s *s = (struct n800_s *) g_malloc0(sizeof(*s));
>      int sdram_size = binfo->ram_size;
>
> -    s->mpu = omap2420_mpu_init(sysmem, sdram_size, machine->cpu_model);
> +    s->mpu = omap2420_mpu_init(sysmem, sdram_size, machine->cpu_type);
>
>      /* Setup peripherals
>       *
> @@ -1426,6 +1426,7 @@ static void n800_class_init(ObjectClass *oc, void *data)
>      mc->init = n800_init;
>      mc->default_boot_order = "";
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm1136-r2");
>  }
>
>  static const TypeInfo n800_type = {
> @@ -1442,6 +1443,7 @@ static void n810_class_init(ObjectClass *oc, void *data)
>      mc->init = n810_init;
>      mc->default_boot_order = "";
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm1136-r2");
>  }
>
>  static const TypeInfo n810_type = {
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 04e65ce..b3e7625 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -3850,7 +3850,7 @@ static int omap_validate_tipb_mpui_addr(struct omap_mpu_state_s *s,
>
>  struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
>                  unsigned long sdram_size,
> -                const char *core)
> +                const char *cpu_type)
>  {
>      int i;
>      struct omap_mpu_state_s *s = g_new0(struct omap_mpu_state_s, 1);
> @@ -3858,12 +3858,9 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
>      DriveInfo *dinfo;
>      SysBusDevice *busdev;
>
> -    if (!core)
> -        core = "ti925t";
> -
>      /* Core */
>      s->mpu_model = omap310;
> -    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core));
> +    s->cpu = ARM_CPU(cpu_create(cpu_type));
>      s->sdram_size = sdram_size;
>      s->sram_size = OMAP15XX_SRAM_SIZE;
>
> diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
> index 5821477..3f6076e 100644
> --- a/hw/arm/omap2.c
> +++ b/hw/arm/omap2.c
> @@ -2250,7 +2250,7 @@ static const struct dma_irq_map omap2_dma_irq_map[] = {
>
>  struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,
>                  unsigned long sdram_size,
> -                const char *core)
> +                const char *cpu_type)
>  {
>      struct omap_mpu_state_s *s = g_new0(struct omap_mpu_state_s, 1);
>      qemu_irq dma_irqs[4];
> @@ -2261,7 +2261,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,
>
>      /* Core */
>      s->mpu_model = omap2420;
> -    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core ?: "arm1136-r2"));
> +    s->cpu = ARM_CPU(cpu_create(cpu_type));
>      s->sdram_size = sdram_size;
>      s->sram_size = OMAP242X_SRAM_SIZE;
>
> diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
> index 4535617..9a14270 100644
> --- a/hw/arm/omap_sx1.c
> +++ b/hw/arm/omap_sx1.c
> @@ -36,6 +36,7 @@
>  #include "sysemu/block-backend.h"
>  #include "sysemu/qtest.h"
>  #include "exec/address-spaces.h"
> +#include "cpu.h"
>
>  /*****************************************************************************/
>  /* Siemens SX1 Cellphone V1 */
> @@ -120,7 +121,7 @@ static void sx1_init(MachineState *machine, const int version)
>      }
>
>      mpu = omap310_mpu_init(address_space, sx1_binfo.ram_size,
> -                           machine->cpu_model);
> +                           machine->cpu_type);
>
>      /* External Flash (EMIFS) */
>      memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size,
> @@ -224,6 +225,7 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, void *data)
>      mc->desc = "Siemens SX1 (OMAP310) V2";
>      mc->init = sx1_init_v2;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
>  }
>
>  static const TypeInfo sx1_machine_v2_type = {
> @@ -239,6 +241,7 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, void *data)
>      mc->desc = "Siemens SX1 (OMAP310) V1";
>      mc->init = sx1_init_v1;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
>  }
>
>  static const TypeInfo sx1_machine_v1_type = {
> diff --git a/hw/arm/palm.c b/hw/arm/palm.c
> index bf070a2..b8753e2 100644
> --- a/hw/arm/palm.c
> +++ b/hw/arm/palm.c
> @@ -29,6 +29,7 @@
>  #include "hw/devices.h"
>  #include "hw/loader.h"
>  #include "exec/address-spaces.h"
> +#include "cpu.h"
>
>  static uint32_t static_readb(void *opaque, hwaddr offset)
>  {
> @@ -195,7 +196,6 @@ static struct arm_boot_info palmte_binfo = {
>
>  static void palmte_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> @@ -211,7 +211,7 @@ static void palmte_init(MachineState *machine)
>      MemoryRegion *flash = g_new(MemoryRegion, 1);
>      MemoryRegion *cs = g_new(MemoryRegion, 4);
>
> -    mpu = omap310_mpu_init(address_space_mem, sdram_size, cpu_model);
> +    mpu = omap310_mpu_init(address_space_mem, sdram_size, machine->cpu_type);
>
>      /* External Flash (EMIFS) */
>      memory_region_init_ram(flash, NULL, "palmte.flash", flash_size,
> @@ -275,6 +275,7 @@ static void palmte_machine_init(MachineClass *mc)
>      mc->desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)";
>      mc->init = palmte_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
>  }
>
>  DEFINE_MACHINE("cheetah", palmte_machine_init)
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index c16657d..cf07234 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -2052,21 +2052,19 @@ static void pxa2xx_reset(void *opaque, int line, int level)
>
>  /* Initialise a PXA270 integrated chip (ARM based core).  */
>  PXA2xxState *pxa270_init(MemoryRegion *address_space,
> -                         unsigned int sdram_size, const char *revision)
> +                         unsigned int sdram_size, const char *cpu_type)
>  {
>      PXA2xxState *s;
>      int i;
>      DriveInfo *dinfo;
>      s = g_new0(PXA2xxState, 1);
>
> -    if (revision && strncmp(revision, "pxa27", 5)) {
> +    if (strncmp(cpu_type, "pxa27", 5)) {
>          fprintf(stderr, "Machine requires a PXA27x processor.\n");
>          exit(1);
>      }
> -    if (!revision)
> -        revision = "pxa270";
>
> -    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, revision));
> +    s->cpu = ARM_CPU(cpu_create(cpu_type));
>      s->reset = qemu_allocate_irq(pxa2xx_reset, s, 0);
>
>      /* SDRAM & Internal Memory Storage */
> @@ -2192,7 +2190,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
>
>      s = g_new0(PXA2xxState, 1);
>
> -    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, "pxa255"));
> +    s->cpu = ARM_CPU(cpu_create(ARM_CPU_TYPE_NAME("pxa255")));
>      s->reset = qemu_allocate_irq(pxa2xx_reset, s, 0);
>
>      /* SDRAM & Internal Memory Storage */
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index f3a49b6..87cd1e5 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -57,7 +57,6 @@ static void realview_init(MachineState *machine,
>  {
>      ARMCPU *cpu = NULL;
>      CPUARMState *env;
> -    ObjectClass *cpu_oc;
>      MemoryRegion *sysmem = get_system_memory();
>      MemoryRegion *ram_lo;
>      MemoryRegion *ram_hi = g_new(MemoryRegion, 1);
> @@ -98,14 +97,8 @@ static void realview_init(MachineState *machine,
>          break;
>      }
>
> -    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, machine->cpu_model);
> -    if (!cpu_oc) {
> -        fprintf(stderr, "Unable to find CPU definition\n");
> -        exit(1);
> -    }
> -
>      for (n = 0; n < smp_cpus; n++) {
> -        Object *cpuobj = object_new(object_class_get_name(cpu_oc));
> +        Object *cpuobj = object_new(machine->cpu_type);
>
>          /* By default A9,A15 and ARM1176 CPUs have EL3 enabled.  This board
>           * does not currently support EL3 so the CPU EL3 property is disabled
> @@ -361,33 +354,21 @@ static void realview_init(MachineState *machine,
>
>  static void realview_eb_init(MachineState *machine)
>  {
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = "arm926";
> -    }
>      realview_init(machine, BOARD_EB);
>  }
>
>  static void realview_eb_mpcore_init(MachineState *machine)
>  {
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = "arm11mpcore";
> -    }
>      realview_init(machine, BOARD_EB_MPCORE);
>  }
>
>  static void realview_pb_a8_init(MachineState *machine)
>  {
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = "cortex-a8";
> -    }
>      realview_init(machine, BOARD_PB_A8);
>  }
>
>  static void realview_pbx_a9_init(MachineState *machine)
>  {
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = "cortex-a9";
> -    }
>      realview_init(machine, BOARD_PBX_A9);
>  }
>
> @@ -399,6 +380,7 @@ static void realview_eb_class_init(ObjectClass *oc, void *data)
>      mc->init = realview_eb_init;
>      mc->block_default_type = IF_SCSI;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>  }
>
>  static const TypeInfo realview_eb_type = {
> @@ -416,6 +398,7 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data)
>      mc->block_default_type = IF_SCSI;
>      mc->max_cpus = 4;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm11mpcore");
>  }
>
>  static const TypeInfo realview_eb_mpcore_type = {
> @@ -431,6 +414,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data)
>      mc->desc = "ARM RealView Platform Baseboard for Cortex-A8";
>      mc->init = realview_pb_a8_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8");
>  }
>
>  static const TypeInfo realview_pb_a8_type = {
> @@ -447,6 +431,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data)
>      mc->init = realview_pbx_a9_init;
>      mc->max_cpus = 4;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
>  }
>
>  static const TypeInfo realview_pbx_a9_type = {
> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
> index 6406421..feccdb0 100644
> --- a/hw/arm/spitz.c
> +++ b/hw/arm/spitz.c
> @@ -30,6 +30,7 @@
>  #include "hw/sysbus.h"
>  #include "exec/address-spaces.h"
>  #include "sysemu/sysemu.h"
> +#include "cpu.h"
>
>  #undef REG_FMT
>  #define REG_FMT                        "0x%02lx"
> @@ -909,13 +910,10 @@ static void spitz_common_init(MachineState *machine,
>      DeviceState *scp0, *scp1 = NULL;
>      MemoryRegion *address_space_mem = get_system_memory();
>      MemoryRegion *rom = g_new(MemoryRegion, 1);
> -    const char *cpu_model = machine->cpu_model;
> -
> -    if (!cpu_model)
> -        cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0";
>
>      /* Setup CPU & memory */
> -    mpu = pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_model);
> +    mpu = pxa270_init(address_space_mem, spitz_binfo.ram_size,
> +                      machine->cpu_type);
>
>      sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
>
> @@ -984,6 +982,7 @@ static void akitapda_class_init(ObjectClass *oc, void *data)
>      mc->desc = "Sharp SL-C1000 (Akita) PDA (PXA270)";
>      mc->init = akita_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c0");
>  }
>
>  static const TypeInfo akitapda_type = {
> @@ -1000,6 +999,7 @@ static void spitzpda_class_init(ObjectClass *oc, void *data)
>      mc->init = spitz_init;
>      mc->block_default_type = IF_IDE;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c0");
>  }
>
>  static const TypeInfo spitzpda_type = {
> @@ -1016,6 +1016,7 @@ static void borzoipda_class_init(ObjectClass *oc, void *data)
>      mc->init = borzoi_init;
>      mc->block_default_type = IF_IDE;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c0");
>  }
>
>  static const TypeInfo borzoipda_type = {
> @@ -1032,6 +1033,7 @@ static void terrierpda_class_init(ObjectClass *oc, void *data)
>      mc->init = terrier_init;
>      mc->block_default_type = IF_IDE;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c5");
>  }
>
>  static const TypeInfo terrierpda_type = {
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index b3aad23..de7c0fc 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -22,6 +22,7 @@
>  #include "sysemu/sysemu.h"
>  #include "hw/char/pl011.h"
>  #include "hw/misc/unimp.h"
> +#include "cpu.h"
>
>  #define GPIO_A 0
>  #define GPIO_B 1
> @@ -1225,8 +1226,7 @@ static stellaris_board_info stellaris_boards[] = {
>    }
>  };
>
> -static void stellaris_init(const char *kernel_filename, const char *cpu_model,
> -                           stellaris_board_info *board)
> +static void stellaris_init(MachineState *ms, stellaris_board_info *board)
>  {
>      static const int uart_irq[] = {5, 6, 33, 34};
>      static const int timer_irq[] = {19, 21, 23, 35};
> @@ -1298,7 +1298,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
>      memory_region_add_subregion(system_memory, 0x20000000, sram);
>
>      nvic = armv7m_init(system_memory, flash_size, NUM_IRQ_LINES,
> -                      kernel_filename, cpu_model);
> +                       ms->kernel_filename, ms->cpu_type);
>
>      qdev_connect_gpio_out_named(nvic, "SYSRESETREQ", 0,
>                                  qemu_allocate_irq(&do_sys_reset, NULL, 0));
> @@ -1435,16 +1435,12 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
>  /* FIXME: Figure out how to generate these from stellaris_boards.  */
>  static void lm3s811evb_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
> -    const char *kernel_filename = machine->kernel_filename;
> -    stellaris_init(kernel_filename, cpu_model, &stellaris_boards[0]);
> +    stellaris_init(machine, &stellaris_boards[0]);
>  }
>
>  static void lm3s6965evb_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
> -    const char *kernel_filename = machine->kernel_filename;
> -    stellaris_init(kernel_filename, cpu_model, &stellaris_boards[1]);
> +    stellaris_init(machine, &stellaris_boards[1]);
>  }
>
>  static void lm3s811evb_class_init(ObjectClass *oc, void *data)
> @@ -1454,6 +1450,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data)
>      mc->desc = "Stellaris LM3S811EVB";
>      mc->init = lm3s811evb_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
>  }
>
>  static const TypeInfo lm3s811evb_type = {
> @@ -1469,6 +1466,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data)
>      mc->desc = "Stellaris LM3S6965EVB";
>      mc->init = lm3s6965evb_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
>  }
>
>  static const TypeInfo lm3s6965evb_type = {
> diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
> index f61e735..1cd6374 100644
> --- a/hw/arm/stm32f205_soc.c
> +++ b/hw/arm/stm32f205_soc.c
> @@ -112,7 +112,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)
>
>      armv7m = DEVICE(&s->armv7m);
>      qdev_prop_set_uint32(armv7m, "num-irq", 96);
> -    qdev_prop_set_string(armv7m, "cpu-model", s->cpu_model);
> +    qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
>      object_property_set_link(OBJECT(&s->armv7m), OBJECT(get_system_memory()),
>                                       "memory", &error_abort);
>      object_property_set_bool(OBJECT(&s->armv7m), true, "realized", &err);
> @@ -200,7 +200,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)
>  }
>
>  static Property stm32f205_soc_properties[] = {
> -    DEFINE_PROP_STRING("cpu-model", STM32F205State, cpu_model),
> +    DEFINE_PROP_STRING("cpu-type", STM32F205State, cpu_type),
>      DEFINE_PROP_END_OF_LIST(),
>  };
>
> diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
> index c1145dd..3d1a231 100644
> --- a/hw/arm/strongarm.c
> +++ b/hw/arm/strongarm.c
> @@ -1581,23 +1581,19 @@ static const TypeInfo strongarm_ssp_info = {
>
>  /* Main CPU functions */
>  StrongARMState *sa1110_init(MemoryRegion *sysmem,
> -                            unsigned int sdram_size, const char *rev)
> +                            unsigned int sdram_size, const char *cpu_type)
>  {
>      StrongARMState *s;
>      int i;
>
>      s = g_new0(StrongARMState, 1);
>
> -    if (!rev) {
> -        rev = "sa1110-b5";
> -    }
> -
> -    if (strncmp(rev, "sa1110", 6)) {
> +    if (strncmp(cpu_type, "sa1110", 6)) {
>          error_report("Machine requires a SA1110 processor.");
>          exit(1);
>      }
>
> -    s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, rev));
> +    s->cpu = ARM_CPU(cpu_create(cpu_type));
>
>      memory_region_allocate_system_memory(&s->sdram, NULL, "strongarm.sdram",
>                                           sdram_size);
> diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
> index 1134cf7..0447963 100644
> --- a/hw/arm/tosa.c
> +++ b/hw/arm/tosa.c
> @@ -219,7 +219,6 @@ static struct arm_boot_info tosa_binfo = {
>
>  static void tosa_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> @@ -229,9 +228,6 @@ static void tosa_init(MachineState *machine)
>      TC6393xbState *tmio;
>      DeviceState *scp0, *scp1;
>
> -    if (!cpu_model)
> -        cpu_model = "pxa255";
> -
>      mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
>
>      memory_region_init_ram(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);
> diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
> index 76664e4..418792c 100644
> --- a/hw/arm/versatilepb.c
> +++ b/hw/arm/versatilepb.c
> @@ -181,7 +181,6 @@ static struct arm_boot_info versatile_binfo;
>
>  static void versatile_init(MachineState *machine, int board_id)
>  {
> -    ObjectClass *cpu_oc;
>      Object *cpuobj;
>      ARMCPU *cpu;
>      MemoryRegion *sysmem = get_system_memory();
> @@ -207,17 +206,7 @@ static void versatile_init(MachineState *machine, int board_id)
>          exit(1);
>      }
>
> -    if (!machine->cpu_model) {
> -        machine->cpu_model = "arm926";
> -    }
> -
> -    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, machine->cpu_model);
> -    if (!cpu_oc) {
> -        fprintf(stderr, "Unable to find CPU definition\n");
> -        exit(1);
> -    }
> -
> -    cpuobj = object_new(object_class_get_name(cpu_oc));
> +    cpuobj = object_new(machine->cpu_type);
>
>      /* By default ARM1176 CPUs have EL3 enabled.  This board does not
>       * currently support EL3 so the CPU EL3 property is disabled before
> @@ -404,6 +393,7 @@ static void versatilepb_class_init(ObjectClass *oc, void *data)
>      mc->init = vpb_init;
>      mc->block_default_type = IF_SCSI;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>  }
>
>  static const TypeInfo versatilepb_type = {
> @@ -420,6 +410,7 @@ static void versatileab_class_init(ObjectClass *oc, void *data)
>      mc->init = vab_init;
>      mc->block_default_type = IF_SCSI;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>  }
>
>  static const TypeInfo versatileab_type = {
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index e3acab6..2e5f670 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -186,7 +186,7 @@ typedef struct {
>
>  typedef void DBoardInitFn(const VexpressMachineState *machine,
>                            ram_addr_t ram_size,
> -                          const char *cpu_model,
> +                          const char *cpu_type,
>                            qemu_irq *pic);
>
>  struct VEDBoardInfo {
> @@ -202,22 +202,16 @@ struct VEDBoardInfo {
>      DBoardInitFn *init;
>  };
>
> -static void init_cpus(const char *cpu_model, const char *privdev,
> +static void init_cpus(const char *cpu_type, const char *privdev,
>                        hwaddr periphbase, qemu_irq *pic, bool secure)
>  {
> -    ObjectClass *cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
>      DeviceState *dev;
>      SysBusDevice *busdev;
>      int n;
>
> -    if (!cpu_oc) {
> -        fprintf(stderr, "Unable to find CPU definition\n");
> -        exit(1);
> -    }
> -
>      /* Create the actual CPUs */
>      for (n = 0; n < smp_cpus; n++) {
> -        Object *cpuobj = object_new(object_class_get_name(cpu_oc));
> +        Object *cpuobj = object_new(cpu_type);
>
>          if (!secure) {
>              object_property_set_bool(cpuobj, false, "has_el3", NULL);
> @@ -262,7 +256,7 @@ static void init_cpus(const char *cpu_model, const char *privdev,
>
>  static void a9_daughterboard_init(const VexpressMachineState *vms,
>                                    ram_addr_t ram_size,
> -                                  const char *cpu_model,
> +                                  const char *cpu_type,
>                                    qemu_irq *pic)
>  {
>      MemoryRegion *sysmem = get_system_memory();
> @@ -270,10 +264,6 @@ static void a9_daughterboard_init(const VexpressMachineState *vms,
>      MemoryRegion *lowram = g_new(MemoryRegion, 1);
>      ram_addr_t low_ram_size;
>
> -    if (!cpu_model) {
> -        cpu_model = "cortex-a9";
> -    }
> -
>      if (ram_size > 0x40000000) {
>          /* 1GB is the maximum the address space permits */
>          fprintf(stderr, "vexpress-a9: cannot model more than 1GB RAM\n");
> @@ -295,7 +285,7 @@ static void a9_daughterboard_init(const VexpressMachineState *vms,
>      memory_region_add_subregion(sysmem, 0x60000000, ram);
>
>      /* 0x1e000000 A9MPCore (SCU) private memory region */
> -    init_cpus(cpu_model, TYPE_A9MPCORE_PRIV, 0x1e000000, pic, vms->secure);
> +    init_cpus(cpu_type, TYPE_A9MPCORE_PRIV, 0x1e000000, pic, vms->secure);
>
>      /* Daughterboard peripherals : 0x10020000 .. 0x20000000 */
>
> @@ -351,17 +341,13 @@ static VEDBoardInfo a9_daughterboard = {
>
>  static void a15_daughterboard_init(const VexpressMachineState *vms,
>                                     ram_addr_t ram_size,
> -                                   const char *cpu_model,
> +                                   const char *cpu_type,
>                                     qemu_irq *pic)
>  {
>      MemoryRegion *sysmem = get_system_memory();
>      MemoryRegion *ram = g_new(MemoryRegion, 1);
>      MemoryRegion *sram = g_new(MemoryRegion, 1);
>
> -    if (!cpu_model) {
> -        cpu_model = "cortex-a15";
> -    }
> -
>      {
>          /* We have to use a separate 64 bit variable here to avoid the gcc
>           * "comparison is always false due to limited range of data type"
> @@ -380,7 +366,7 @@ static void a15_daughterboard_init(const VexpressMachineState *vms,
>      memory_region_add_subregion(sysmem, 0x80000000, ram);
>
>      /* 0x2c000000 A15MPCore private memory region (GIC) */
> -    init_cpus(cpu_model, TYPE_A15MPCORE_PRIV, 0x2c000000, pic, vms->secure);
> +    init_cpus(cpu_type, TYPE_A15MPCORE_PRIV, 0x2c000000, pic, vms->secure);
>
>      /* A15 daughterboard peripherals: */
>
> @@ -560,7 +546,7 @@ static void vexpress_common_init(MachineState *machine)
>      const hwaddr *map = daughterboard->motherboard_map;
>      int i;
>
> -    daughterboard->init(vms, machine->ram_size, machine->cpu_model, pic);
> +    daughterboard->init(vms, machine->ram_size, machine->cpu_type, pic);
>
>      /*
>       * If a bios file was provided, attempt to map it into memory
> @@ -761,6 +747,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data)
>      VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc);
>
>      mc->desc = "ARM Versatile Express for Cortex-A9";
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
>
>      vmc->daughterboard = &a9_daughterboard;
>  }
> @@ -771,6 +758,7 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data)
>      VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc);
>
>      mc->desc = "ARM Versatile Express for Cortex-A15";
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
>
>      vmc->daughterboard = &a15_daughterboard;
>  }
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index fe96557..fe26e99 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -163,13 +163,13 @@ static const int a15irqmap[] = {
>  };
>
>  static const char *valid_cpus[] = {
> -    "cortex-a15",
> -    "cortex-a53",
> -    "cortex-a57",
> -    "host",
> +    ARM_CPU_TYPE_NAME("cortex-a15"),
> +    ARM_CPU_TYPE_NAME("cortex-a53"),
> +    ARM_CPU_TYPE_NAME("cortex-a57"),
> +    ARM_CPU_TYPE_NAME("host"),
>  };
>
> -static bool cpuname_valid(const char *cpu)
> +static bool cpu_type_valid(const char *cpu)
>  {
>      int i;
>
> @@ -1258,18 +1258,8 @@ static void machvirt_init(MachineState *machine)
>      MemoryRegion *secure_sysmem = NULL;
>      int n, virt_max_cpus;
>      MemoryRegion *ram = g_new(MemoryRegion, 1);
> -    const char *cpu_model = machine->cpu_model;
> -    char **cpustr;
> -    ObjectClass *oc;
> -    const char *typename;
> -    CPUClass *cc;
> -    Error *err = NULL;
>      bool firmware_loaded = bios_name || drive_get(IF_PFLASH, 0, 0);
>
> -    if (!cpu_model) {
> -        cpu_model = "cortex-a15";
> -    }
> -
>      /* We can probe only here because during property set
>       * KVM is not available yet
>       */
> @@ -1286,11 +1276,8 @@ static void machvirt_init(MachineState *machine)
>          }
>      }
>
> -    /* Separate the actual CPU model name from any appended features */
> -    cpustr = g_strsplit(cpu_model, ",", 2);
> -
> -    if (!cpuname_valid(cpustr[0])) {
> -        error_report("mach-virt: CPU %s not supported", cpustr[0]);
> +    if (!cpu_type_valid(machine->cpu_type)) {
> +        error_report("mach-virt: CPU type %s not supported", machine->cpu_type);
>          exit(1);
>      }
>
> @@ -1360,22 +1347,6 @@ static void machvirt_init(MachineState *machine)
>
>      create_fdt(vms);
>
> -    oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);
> -    if (!oc) {
> -        error_report("Unable to find CPU definition");
> -        exit(1);
> -    }
> -    typename = object_class_get_name(oc);
> -
> -    /* convert -smp CPU options specified by the user into global props */
> -    cc = CPU_CLASS(oc);
> -    cc->parse_features(typename, cpustr[1], &err);
> -    g_strfreev(cpustr);
> -    if (err) {
> -        error_report_err(err);
> -        exit(1);
> -    }
> -
>      possible_cpus = mc->possible_cpu_arch_ids(machine);
>      for (n = 0; n < possible_cpus->len; n++) {
>          Object *cpuobj;
> @@ -1385,7 +1356,7 @@ static void machvirt_init(MachineState *machine)
>              break;
>          }
>
> -        cpuobj = object_new(typename);
> +        cpuobj = object_new(machine->cpu_type);
>          object_property_set_int(cpuobj, possible_cpus->cpus[n].arch_id,
>                                  "mp-affinity", NULL);
>
> @@ -1630,6 +1601,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
>      mc->minimum_page_bits = 12;
>      mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids;
>      mc->cpu_index_to_instance_props = virt_cpu_index_to_props;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
>  }
>
>  static const TypeInfo virt_machine_info = {
> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index 3759cf8..1836a4e 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -158,11 +158,9 @@ static inline void zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,
>  static void zynq_init(MachineState *machine)
>  {
>      ram_addr_t ram_size = machine->ram_size;
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> -    ObjectClass *cpu_oc;
>      ARMCPU *cpu;
>      MemoryRegion *address_space_mem = get_system_memory();
>      MemoryRegion *ext_ram = g_new(MemoryRegion, 1);
> @@ -174,12 +172,7 @@ static void zynq_init(MachineState *machine)
>      qemu_irq pic[64];
>      int n;
>
> -    if (!cpu_model) {
> -        cpu_model = "cortex-a9";
> -    }
> -    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
> -
> -    cpu = ARM_CPU(object_new(object_class_get_name(cpu_oc)));
> +    cpu = ARM_CPU(object_new(machine->cpu_type));
>
>      /* By default A9 CPUs have EL3 enabled.  This board does not
>       * currently support EL3 so the CPU EL3 property is disabled before
> @@ -327,6 +320,7 @@ static void zynq_machine_init(MachineClass *mc)
>      mc->max_cpus = 1;
>      mc->no_sdcard = 1;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
>  }
>
>  DEFINE_MACHINE("xilinx-zynq-a9", zynq_machine_init)
> diff --git a/hw/arm/z2.c b/hw/arm/z2.c
> index 417bc1a..60561c7 100644
> --- a/hw/arm/z2.c
> +++ b/hw/arm/z2.c
> @@ -26,6 +26,7 @@
>  #include "audio/audio.h"
>  #include "exec/address-spaces.h"
>  #include "sysemu/qtest.h"
> +#include "cpu.h"
>
>  #ifdef DEBUG_Z2
>  #define DPRINTF(fmt, ...) \
> @@ -296,7 +297,6 @@ static const TypeInfo aer915_info = {
>
>  static void z2_init(MachineState *machine)
>  {
> -    const char *cpu_model = machine->cpu_model;
>      const char *kernel_filename = machine->kernel_filename;
>      const char *kernel_cmdline = machine->kernel_cmdline;
>      const char *initrd_filename = machine->initrd_filename;
> @@ -309,12 +309,8 @@ static void z2_init(MachineState *machine)
>      I2CBus *bus;
>      DeviceState *wm;
>
> -    if (!cpu_model) {
> -        cpu_model = "pxa270-c5";
> -    }
> -
>      /* Setup CPU & memory */
> -    mpu = pxa270_init(address_space_mem, z2_binfo.ram_size, cpu_model);
> +    mpu = pxa270_init(address_space_mem, z2_binfo.ram_size, machine->cpu_type);
>
>  #ifdef TARGET_WORDS_BIGENDIAN
>      be = 1;
> @@ -371,6 +367,7 @@ static void z2_machine_init(MachineClass *mc)
>      mc->desc = "Zipit Z2 (PXA27x)";
>      mc->init = z2_init;
>      mc->ignore_memory_transaction_failures = true;
> +    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c5");
>  }
>
>  DEFINE_MACHINE("z2", z2_machine_init)
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index a1acce3..ff7ff28 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -905,7 +905,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
>      }
>
>      cpuname = g_strsplit(cpu_model, ",", 1);
> -    typename = g_strdup_printf("%s-" TYPE_ARM_CPU, cpuname[0]);
> +    typename = g_strdup_printf(ARM_CPU_TYPE_NAME("%s"), cpuname[0]);
>      oc = object_class_by_name(typename);
>      g_strfreev(cpuname);
>      g_free(typename);
> --
> 2.7.4
>
>

  parent reply	other threads:[~2017-09-14 17:58 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-13 16:04 [Qemu-devel] [PATCH v2 0/5] generalize parsing of cpu_model (x86/arm) Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 1/5] qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 2/5] cpu: make cpu_generic_init() abort QEMU on error Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 3/5] vl.c: convert cpu_model to cpu type and set of global properties before machine_init() Igor Mammedov
2017-09-14 18:19   ` Philippe Mathieu-Daudé
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 4/5] pc: use generic cpu_model parsing Igor Mammedov
2017-09-13 16:04 ` [Qemu-devel] [PATCH v2 5/5] arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly Igor Mammedov
2017-09-14  3:47   ` Philippe Mathieu-Daudé
2017-09-14  7:50     ` Igor Mammedov
2017-09-14 22:09       ` Alistair Francis
2017-09-14 17:57   ` Alistair Francis [this message]
2017-09-18 21:53   ` [Qemu-devel] [PATCH] !fixup arm: missed comment update Philippe Mathieu-Daudé
2017-09-15 15:03 ` [Qemu-devel] [PATCH v2 0/5] generalize parsing of cpu_model (x86/arm) Igor Mammedov
2017-09-18 16:42   ` Igor Mammedov
2017-09-19 12:11     ` Eduardo Habkost
2017-09-19 12:46       ` Igor Mammedov
2017-09-19 12:56       ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAKmqyKPF=KnePCTefLEA1PkCquThchLcm2mDR_C4oaVhbi1sXA@mail.gmail.com' \
    --to=alistair23@gmail.com \
    --cc=imammedo@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.