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

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



Machine queue, 2020-02-28

Cleanups:
* Fix NMI() macro (Philippe Mathieu-Daudé)
* Make MachineClass::is_default boolean, refuse multiple
  default machines (Philippe Mathieu-Daudé)

# gpg: Signature made Fri 28 Feb 2020 21:03:20 GMT
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  vl: Abort if multiple machines are registered as default
  hw: Make MachineClass::is_default a boolean type
  hw: Do not initialize MachineClass::is_default to 0
  hw/nmi: Fix the NMI() macro, based on INTERFACE_CHECK()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e0175b71 6db1857e

hw/alpha/dp264.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void clipper_machine_init(MachineClass *mc) 
    mc->init = clipper_init;

    mc->block_default_type = IF_IDE;

    mc->max_cpus = 4;

    mc->is_default = 1;

    mc->is_default = true;

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

    mc->default_ram_id = "ram";

}

hw/cris/axis_dev88.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static void axisdev88_machine_init(MachineClass *mc) 
{

    mc->desc = "AXIS devboard 88";

    mc->init = axisdev88_init;

    mc->is_default = 1;

    mc->is_default = true;

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

    mc->default_ram_id = "axisdev88.ram";

}

hw/hppa/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void machine_hppa_machine_init(MachineClass *mc) 
    mc->block_default_type = IF_SCSI;

    mc->max_cpus = HPPA_MAX_CPUS;

    mc->default_cpus = 1;

    mc->is_default = 1;

    mc->is_default = true;

    mc->default_ram_size = 512 * MiB;

    mc->default_boot_order = "cd";

    mc->default_ram_id = "ram";

hw/i386/pc_piix.c

+5 −5
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static void pc_i440fx_5_0_machine_options(MachineClass *m) 
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

    m->is_default = true;

    pcmc->default_cpu_version = 1;

}
@@ -434,7 +434,7 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m) 
{

    pc_i440fx_5_0_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    m->is_default = false;

    compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);

    compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len);

}
@@ -446,7 +446,7 @@ static void pc_i440fx_4_1_machine_options(MachineClass *m) 
{

    pc_i440fx_4_2_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    m->is_default = false;

    compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len);

    compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len);

}
@@ -459,7 +459,7 @@ static void pc_i440fx_4_0_machine_options(MachineClass *m) 
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_4_1_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    m->is_default = false;

    pcmc->default_cpu_version = CPU_VERSION_LEGACY;

    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);

    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
@@ -473,7 +473,7 @@ static void pc_i440fx_3_1_machine_options(MachineClass *m) 
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);



    pc_i440fx_4_0_machine_options(m);

    m->is_default = 0;

    m->is_default = false;

    pcmc->do_not_add_smb_acpi = true;

    m->smbus_no_migration_support = true;

    m->alias = NULL;

hw/lm32/lm32_boards.c

+1 −2
Original line number Diff line number Diff line
@@ -295,7 +295,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->is_default = true;

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

    mc->default_ram_size = 64 * MiB;

    mc->default_ram_id = "lm32_evr.sdram";
@@ -313,7 +313,6 @@ 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");

    mc->default_ram_size = 64 * MiB;

    mc->default_ram_id = "lm32_uclinux.sdram";