Commit ab752f23 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging 



x86/cpu/numa queue, 2017-10-27

# gpg: Signature made Fri 27 Oct 2017 15:17:12 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-and-machine-pull-request: (39 commits)
  x86: Skip check apic_id_limit for Xen
  numa: fixup parsed NumaNodeOptions earlier
  mips: r4k: replace cpu_model with cpu_type
  mips: mipssim: replace cpu_model with cpu_type
  mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type
  mips: fulong2e: replace cpu_model with cpu_type
  mips: malta/boston: replace cpu_model with cpu_type
  mips: use object_new() instead of gnew()+object_initialize()
  sparc: leon3: use generic cpu_model parsing
  sparc: sparc: use generic cpu_model parsing
  sparc: sun4u/sun4v/niagara: use generic cpu_model parsing
  sparc: cleanup cpu type name composition
  tricore: use generic cpu_model parsing
  tricore: cleanup cpu type name composition
  unicore32: use generic cpu_model parsing
  unicore32: cleanup cpu type name composition
  xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing
  xtensa: sim: use generic cpu_model parsing
  xtensa: cleanup cpu type name composition
  sh4: remove SuperHCPUClass::name field
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 953e35f6 1a26f466

hw/alpha/dp264.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num) 
static void clipper_init(MachineState *machine)

{

    ram_addr_t ram_size = machine->ram_size;

    const char *cpu_model = machine->cpu_model ? machine->cpu_model : "ev67";

    const char *kernel_filename = machine->kernel_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;

    const char *initrd_filename = machine->initrd_filename;
@@ -67,7 +66,7 @@ static void clipper_init(MachineState *machine) 
    /* Create up to 4 cpus.  */

    memset(cpus, 0, sizeof(cpus));

    for (i = 0; i < smp_cpus; ++i) {

        cpus[i] = ALPHA_CPU(cpu_generic_init(TYPE_ALPHA_CPU, cpu_model));

        cpus[i] = ALPHA_CPU(cpu_create(machine->cpu_type));

    }



    cpus[0]->env.trap_arg0 = ram_size;
@@ -179,6 +178,7 @@ static void clipper_machine_init(MachineClass *mc) 
    mc->block_default_type = IF_IDE;

    mc->max_cpus = 4;

    mc->is_default = 1;

    mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67");

}



DEFINE_MACHINE("clipper", clipper_machine_init)

hw/cris/axis_dev88.c

+2 −5
Original line number Diff line number Diff line
@@ -251,7 +251,6 @@ static 
void axisdev88_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;

    CRISCPU *cpu;
@@ -268,10 +267,7 @@ void axisdev88_init(MachineState *machine) 
    MemoryRegion *phys_intmem = g_new(MemoryRegion, 1);



    /* init CPUs */

    if (cpu_model == NULL) {

        cpu_model = "crisv32";

    }

    cpu = CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));

    cpu = CRIS_CPU(cpu_create(machine->cpu_type));

    env = &cpu->env;



    /* allocate RAM */
@@ -359,6 +355,7 @@ static void axisdev88_machine_init(MachineClass *mc) 
    mc->desc = "AXIS devboard 88";

    mc->init = axisdev88_init;

    mc->is_default = 1;

    mc->default_cpu_type = CRIS_CPU_TYPE_NAME("crisv32");

}



DEFINE_MACHINE("axis-dev88", axisdev88_machine_init)

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,7 @@ void pc_machine_done(Notifier *notifier, void *data) 
        fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);

    }



    if (pcms->apic_id_limit > 255) {

    if (pcms->apic_id_limit > 255 && !xen_enabled()) {

        IntelIOMMUState *iommu = INTEL_IOMMU_DEVICE(x86_iommu_get_default());



        if (!iommu || !iommu->x86_iommu.intr_supported ||

hw/lm32/lm32_boards.c

+4 −10
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static void main_cpu_reset(void *opaque) 


static void lm32_evr_init(MachineState *machine)

{

    const char *cpu_model = machine->cpu_model;

    const char *kernel_filename = machine->kernel_filename;

    LM32CPU *cpu;

    CPULM32State *env;
@@ -101,10 +100,7 @@ static void lm32_evr_init(MachineState *machine) 


    reset_info = g_malloc0(sizeof(ResetInfo));



    if (cpu_model == NULL) {

        cpu_model = "lm32-full";

    }

    cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

    cpu = LM32_CPU(cpu_create(machine->cpu_type));



    env = &cpu->env;

    reset_info->cpu = cpu;
@@ -163,7 +159,6 @@ static void lm32_evr_init(MachineState *machine) 


static void lm32_uclinux_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;
@@ -198,10 +193,7 @@ static void lm32_uclinux_init(MachineState *machine) 


    reset_info = g_malloc0(sizeof(ResetInfo));



    if (cpu_model == NULL) {

        cpu_model = "lm32-full";

    }

    cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

    cpu = LM32_CPU(cpu_create(machine->cpu_type));



    env = &cpu->env;

    reset_info->cpu = cpu;
@@ -295,6 +287,7 @@ static void lm32_evr_class_init(ObjectClass *oc, void *data) 
    mc->desc = "LatticeMico32 EVR32 eval system";

    mc->init = lm32_evr_init;

    mc->is_default = 1;

    mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");

}



static const TypeInfo lm32_evr_type = {
@@ -310,6 +303,7 @@ static void lm32_uclinux_class_init(ObjectClass *oc, void *data) 
    mc->desc = "lm32 platform for uClinux and u-boot by Theobroma Systems";

    mc->init = lm32_uclinux_init;

    mc->is_default = 0;

    mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");

}



static const TypeInfo lm32_uclinux_type = {

hw/lm32/milkymist.c

+2 −5
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static void main_cpu_reset(void *opaque) 
static void

milkymist_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;
@@ -108,10 +107,7 @@ milkymist_init(MachineState *machine) 


    reset_info = g_malloc0(sizeof(ResetInfo));



    if (cpu_model == NULL) {

        cpu_model = "lm32-full";

    }

    cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));

    cpu = LM32_CPU(cpu_create(machine->cpu_type));



    env = &cpu->env;

    reset_info->cpu = cpu;
@@ -216,6 +212,7 @@ static void milkymist_machine_init(MachineClass *mc) 
    mc->desc = "Milkymist One";

    mc->init = milkymist_init;

    mc->is_default = 0;

    mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");

}



DEFINE_MACHINE("milkymist", milkymist_machine_init)