On Fri, Apr 24, 2020 at 11:03:14AM +0200, Cornelia Huck wrote: > Add 5.1 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <coh...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com> > --- > > Still keeping the default cpu model version on x86 at v1. > > I'll queue this to my s390-next branch, as I'm planning to send a pull > req as soon as 5.0 is out; if someone else wants to queue this, we'll > figure it out :) Feel free to do so. > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 71 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 7dc96abf72cf..5e84c09402dd 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > + > static void virt_machine_5_0_options(MachineClass *mc) > { > static GlobalProperty compat[] = { > { TYPE_TPM_TIS_SYSBUS, "ppi", "false" }, > }; > > + virt_machine_5_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); > compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) > +DEFINE_VIRT_MACHINE(5, 0) > > static void virt_machine_4_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index c1a444cb7558..7a50dd518f4c 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -28,6 +28,9 @@ > #include "hw/mem/nvdimm.h" > #include "migration/vmstate.h" > > +GlobalProperty hw_compat_5_0[] = {}; > +const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0); > + > GlobalProperty hw_compat_4_2[] = { > { "virtio-blk-device", "queue-size", "128"}, > { "virtio-scsi-device", "virtqueue_size", "128"}, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 5143c516531e..13e1d18cd758 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -94,6 +94,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > +GlobalProperty pc_compat_5_0[] = {}; > +const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > + > GlobalProperty pc_compat_4_2[] = { > { "mch", "smbase-smram", "off" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 22dee0e76c62..921caa502b85 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -419,7 +419,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > > -static void pc_i440fx_5_0_machine_options(MachineClass *m) > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -428,6 +428,18 @@ static void pc_i440fx_5_0_machine_options(MachineClass > *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > + pc_i440fx_5_1_machine_options); > + > +static void pc_i440fx_5_0_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_1_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len); > + compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len); > +} > + > DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, > pc_i440fx_5_0_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index d37c425e2236..253688a9b8f3 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -349,7 +349,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_5_0_machine_options(MachineClass *m) > +static void pc_q35_5_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -357,6 +357,17 @@ static void pc_q35_5_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > + pc_q35_5_1_machine_options); > + > +static void pc_q35_5_0_machine_options(MachineClass *m) > +{ > + pc_q35_5_1_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len); > + compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len); > +} > + > DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, > pc_q35_5_0_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 9a2bd501aa6e..fd5bfd11a84c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4599,15 +4599,26 @@ static void > spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.1 > + */ > +static void spapr_machine_5_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > + > /* > * pseries-5.0 > */ > static void spapr_machine_5_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); > } > > -DEFINE_SPAPR_MACHINE(5_0, "5.0", true); > +DEFINE_SPAPR_MACHINE(5_0, "5.0", false); > > /* > * pseries-4.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 0fa00a9fff3d..967a6de9683b 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -672,14 +672,26 @@ bool css_migration_enabled(void) > } > \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_5_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_1, "5.1", true); > + > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > + ccw_machine_5_1_instance_options(machine); > } > > static void ccw_machine_5_0_class_options(MachineClass *mc) > { > + ccw_machine_5_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); > } > -DEFINE_CCW_MACHINE(5_0, "5.0", true); > +DEFINE_CCW_MACHINE(5_0, "5.0", false); > > static void ccw_machine_4_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index fd4d62b5010f..18815d9be24f 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -318,6 +318,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_5_0[]; > +extern const size_t hw_compat_5_0_len; > + > extern GlobalProperty hw_compat_4_2[]; > extern const size_t hw_compat_4_2_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 6ab6eda046fd..15b9294dac38 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -204,6 +204,9 @@ void pc_system_firmware_init(PCMachineState *pcms, > MemoryRegion *rom_memory); > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > > +extern GlobalProperty pc_compat_5_0[]; > +extern const size_t pc_compat_5_0_len; > + > extern GlobalProperty pc_compat_4_2[]; > extern const size_t pc_compat_4_2_len; > > -- > 2.21.1