| Message ID | 20191212173320.11610-2-drjones@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/arm/kvm: Adjust virtual time | expand |
On 12.12.19 18:33, Andrew Jones wrote: > Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Andrew Jones <drjones@redhat.com> > [...] > /* > * pseries-4.1 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index d3edeef0ad92..a40f79e20733 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -639,14 +639,27 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > + > +static void ccw_machine_5_0_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_0_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_0, "5.0", true); > + > static void ccw_machine_4_2_instance_options(MachineState *machine) > { > + ccw_machine_5_0_instance_options(machine); > } > > static void ccw_machine_4_2_class_options(MachineClass *mc) > { > + ccw_machine_5_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); > } > -DEFINE_CCW_MACHINE(4_2, "4.2", true); > +DEFINE_CCW_MACHINE(4_2, "4.2", false); > s390x parts LGTM Reviewed-by: David Hildenbrand <david@redhat.com>
On Thu, Dec 12, 2019 at 06:33:16PM +0100, Andrew Jones wrote: > Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Andrew Jones <drjones@redhat.com> > > --- > > Hi Eduardo, > > If we need to do something special for i440fx and q35, as > 9aec2e52ce9d ("hw: add compat machines for 4.2") implies, then > I'll need guidance as to what. Keeping default_cpu_version==1 in pc-*-5.0 (like you did) is correct. However, you might want to use Cornelia's patch (which is probably already queued in the s390 tree) instead: https://patchew.org/QEMU/20191112104811.30323-1-cohuck@redhat.com
On Thu, Dec 12, 2019 at 06:33:16PM +0100, Andrew Jones wrote: > Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Andrew Jones <drjones@redhat.com> ppc parts Acked-by: David Gibson <david@gibson.dropbear.id.au> > > --- > > Hi Eduardo, > > If we need to do something special for i440fx and q35, as > 9aec2e52ce9d ("hw: add compat machines for 4.2") implies, then > I'll need guidance as to what. > --- > 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 | 15 ++++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 72 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d4bedc260712..cb7041e9677a 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2147,10 +2147,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_0_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) > + > static void virt_machine_4_2_options(MachineClass *mc) > { > + virt_machine_5_0_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) > +DEFINE_VIRT_MACHINE(4, 2) > > static void virt_machine_4_1_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 1689ad3bf8af..21fe2d974817 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -27,6 +27,9 @@ > #include "hw/pci/pci.h" > #include "hw/mem/nvdimm.h" > > +GlobalProperty hw_compat_4_2[] = {}; > +const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2); > + > GlobalProperty hw_compat_4_1[] = { > { "virtio-pci", "x-pcie-flr-init", "off" }, > }; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index ac08e6360437..58867f987d88 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -103,6 +103,9 @@ > > struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; > > +GlobalProperty pc_compat_4_2[] = {}; > +const size_t pc_compat_4_2_len = G_N_ELEMENTS(pc_compat_4_2); > + > GlobalProperty pc_compat_4_1[] = {}; > const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 1bd70d1abbc4..aa2c6147a7ea 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -424,7 +424,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > > -static void pc_i440fx_4_2_machine_options(MachineClass *m) > +static void pc_i440fx_5_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -433,6 +433,18 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, > + pc_i440fx_5_0_machine_options) > + > +static void pc_i440fx_4_2_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_0_machine_options(m); > + m->alias = NULL; > + m->is_default = 0; > + 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); > +} > + > DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL, > pc_i440fx_4_2_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 385e5cffb167..ddd485d608c0 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -348,7 +348,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_4_2_machine_options(MachineClass *m) > +static void pc_q35_5_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -356,6 +356,17 @@ static void pc_q35_4_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, > + pc_q35_5_0_machine_options); > + > +static void pc_q35_4_2_machine_options(MachineClass *m) > +{ > + pc_q35_5_0_machine_options(m); > + m->alias = NULL; > + 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); > +} > + > DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, > pc_q35_4_2_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index e076f6023c73..3ae7db156303 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4491,15 +4491,26 @@ static const TypeInfo spapr_machine_info = { > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.0 > + */ > +static void spapr_machine_5_0_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_0, "5.0", true); > + > /* > * pseries-4.2 > */ > static void spapr_machine_4_2_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); > } > > -DEFINE_SPAPR_MACHINE(4_2, "4.2", true); > +DEFINE_SPAPR_MACHINE(4_2, "4.2", false); > > /* > * pseries-4.1 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index d3edeef0ad92..a40f79e20733 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -639,14 +639,27 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > + > +static void ccw_machine_5_0_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_0_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_0, "5.0", true); > + > static void ccw_machine_4_2_instance_options(MachineState *machine) > { > + ccw_machine_5_0_instance_options(machine); > } > > static void ccw_machine_4_2_class_options(MachineClass *mc) > { > + ccw_machine_5_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); > } > -DEFINE_CCW_MACHINE(4_2, "4.2", true); > +DEFINE_CCW_MACHINE(4_2, "4.2", false); > > static void ccw_machine_4_1_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index de45087f34cb..24cbeecbaecc 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -329,6 +329,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_4_2[]; > +extern const size_t hw_compat_4_2_len; > + > extern GlobalProperty hw_compat_4_1[]; > extern const size_t hw_compat_4_1_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 1f86eba3f998..61a998de4665 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -237,6 +237,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_4_2[]; > +extern const size_t pc_compat_4_2_len; > + > extern GlobalProperty pc_compat_4_1[]; > extern const size_t pc_compat_4_1_len; >
On Thu, Dec 12, 2019 at 04:24:19PM -0300, Eduardo Habkost wrote: > On Thu, Dec 12, 2019 at 06:33:16PM +0100, Andrew Jones wrote: > > Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. > > > > Signed-off-by: Andrew Jones <drjones@redhat.com> > > > > --- > > > > Hi Eduardo, > > > > If we need to do something special for i440fx and q35, as > > 9aec2e52ce9d ("hw: add compat machines for 4.2") implies, then > > I'll need guidance as to what. > > Keeping default_cpu_version==1 in pc-*-5.0 (like you did) is > correct. > > However, you might want to use Cornelia's patch (which is > probably already queued in the s390 tree) instead: > https://patchew.org/QEMU/20191112104811.30323-1-cohuck@redhat.com > Drat. I did search the mailing list for a posting from someone else first, but I made the mistake of searching subjects for 'machine type' rather than 'compat machines'. Certainly we should use Cornelia's. Mine is just noise. Thank you reviewers, and sorry for the duplicated effort. drew
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d4bedc260712..cb7041e9677a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2147,10 +2147,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_5_0_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) + static void virt_machine_4_2_options(MachineClass *mc) { + virt_machine_5_0_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) +DEFINE_VIRT_MACHINE(4, 2) static void virt_machine_4_1_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 1689ad3bf8af..21fe2d974817 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,9 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +GlobalProperty hw_compat_4_2[] = {}; +const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2); + GlobalProperty hw_compat_4_1[] = { { "virtio-pci", "x-pcie-flr-init", "off" }, }; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac08e6360437..58867f987d88 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -103,6 +103,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; +GlobalProperty pc_compat_4_2[] = {}; +const size_t pc_compat_4_2_len = G_N_ELEMENTS(pc_compat_4_2); + GlobalProperty pc_compat_4_1[] = {}; const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1bd70d1abbc4..aa2c6147a7ea 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -424,7 +424,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); } -static void pc_i440fx_4_2_machine_options(MachineClass *m) +static void pc_i440fx_5_0_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -433,6 +433,18 @@ static void pc_i440fx_4_2_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, + pc_i440fx_5_0_machine_options) + +static void pc_i440fx_4_2_machine_options(MachineClass *m) +{ + pc_i440fx_5_0_machine_options(m); + m->alias = NULL; + m->is_default = 0; + 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); +} + DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL, pc_i440fx_4_2_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 385e5cffb167..ddd485d608c0 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -348,7 +348,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_4_2_machine_options(MachineClass *m) +static void pc_q35_5_0_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -356,6 +356,17 @@ static void pc_q35_4_2_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, + pc_q35_5_0_machine_options); + +static void pc_q35_4_2_machine_options(MachineClass *m) +{ + pc_q35_5_0_machine_options(m); + m->alias = NULL; + 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); +} + DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, pc_q35_4_2_machine_options); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e076f6023c73..3ae7db156303 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4491,15 +4491,26 @@ static const TypeInfo spapr_machine_info = { } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-5.0 + */ +static void spapr_machine_5_0_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_0, "5.0", true); + /* * pseries-4.2 */ static void spapr_machine_4_2_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_5_0_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); } -DEFINE_SPAPR_MACHINE(4_2, "4.2", true); +DEFINE_SPAPR_MACHINE(4_2, "4.2", false); /* * pseries-4.1 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index d3edeef0ad92..a40f79e20733 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -639,14 +639,27 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) + +static void ccw_machine_5_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_0_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_0, "5.0", true); + static void ccw_machine_4_2_instance_options(MachineState *machine) { + ccw_machine_5_0_instance_options(machine); } static void ccw_machine_4_2_class_options(MachineClass *mc) { + ccw_machine_5_0_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); } -DEFINE_CCW_MACHINE(4_2, "4.2", true); +DEFINE_CCW_MACHINE(4_2, "4.2", false); static void ccw_machine_4_1_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index de45087f34cb..24cbeecbaecc 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -329,6 +329,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_4_2[]; +extern const size_t hw_compat_4_2_len; + extern GlobalProperty hw_compat_4_1[]; extern const size_t hw_compat_4_1_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1f86eba3f998..61a998de4665 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -237,6 +237,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_4_2[]; +extern const size_t pc_compat_4_2_len; + extern GlobalProperty pc_compat_4_1[]; extern const size_t pc_compat_4_1_len;
Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Andrew Jones <drjones@redhat.com> --- Hi Eduardo, If we need to do something special for i440fx and q35, as 9aec2e52ce9d ("hw: add compat machines for 4.2") implies, then I'll need guidance as to what. --- 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 | 15 ++++++++++++++- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 9 files changed, 72 insertions(+), 6 deletions(-)