| Message ID | 20211208170241.110551-1-cohuck@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-7.0] hw: Add compat machines for 7.0 | expand |
On 12/8/21 18:02, Cornelia Huck wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > 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 30da05dfe040..ddcfab426436 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2857,10 +2857,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_7_0_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) > + > static void virt_machine_6_2_options(MachineClass *mc) > { > + virt_machine_7_0_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) > +DEFINE_VIRT_MACHINE(6, 2) > > static void virt_machine_6_1_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 53a99abc5605..a9c15479fe1d 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,6 +37,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_6_2[] = {}; > +const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); > + > GlobalProperty hw_compat_6_1[] = { > { "vhost-user-vsock-device", "seqpacket", "off" }, > { "nvme-ns", "shared", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index a2ef40ecbc24..fccde2ef39f6 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -94,6 +94,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_6_2[] = {}; > +const size_t pc_compat_6_2_len = G_N_ELEMENTS(pc_compat_6_2); > + > GlobalProperty pc_compat_6_1[] = { > { TYPE_X86_CPU, "hv-version-id-build", "0x1bbc" }, > { TYPE_X86_CPU, "hv-version-id-major", "0x0006" }, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 223dd3e05d15..b03026bf0648 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_6_2_machine_options(MachineClass *m) > +static void pc_i440fx_7_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, > + pc_i440fx_7_0_machine_options); > + > +static void pc_i440fx_6_2_machine_options(MachineClass *m) > +{ > + pc_i440fx_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > +} > + > DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, > pc_i440fx_6_2_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index e1e100316d93..6b66eb16bb64 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_6_2_machine_options(MachineClass *m) > +static void pc_q35_7_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, > + pc_q35_7_0_machine_options); > + > +static void pc_q35_6_2_machine_options(MachineClass *m) > +{ > + pc_q35_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > +} > + > DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, > pc_q35_6_2_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 3b5fd749be89..837342932586 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4665,15 +4665,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-7.0 > + */ > +static void spapr_machine_7_0_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(7_0, "7.0", true); > + > /* > * pseries-6.2 > */ > static void spapr_machine_6_2_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_7_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); > } > > -DEFINE_SPAPR_MACHINE(6_2, "6.2", true); > +DEFINE_SPAPR_MACHINE(6_2, "6.2", false); > > /* > * pseries-6.1 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 653587ea62f4..84e3e63c430d 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -791,14 +791,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_7_0_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_7_0_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(7_0, "7.0", true); > + > static void ccw_machine_6_2_instance_options(MachineState *machine) > { > + ccw_machine_7_0_instance_options(machine); > } > > static void ccw_machine_6_2_class_options(MachineClass *mc) > { > + ccw_machine_7_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); > } > -DEFINE_CCW_MACHINE(6_2, "6.2", true); > +DEFINE_CCW_MACHINE(6_2, "6.2", false); > > static void ccw_machine_6_1_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 9c1c1901046c..b7b68471ffc1 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -375,6 +375,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_6_2[]; > +extern const size_t hw_compat_6_2_len; > + > extern GlobalProperty hw_compat_6_1[]; > extern const size_t hw_compat_6_1_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 9ab39e428f80..b38947c224cd 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -196,6 +196,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_6_2[]; > +extern const size_t pc_compat_6_2_len; > + > extern GlobalProperty pc_compat_6_1[]; > extern const size_t pc_compat_6_1_len; > >
On 08/12/2021 18.02, Cornelia Huck wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > 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(-) Thanks, I've queued this to my s390x-next branch now (since nobody else objected, I assume the patch should be fine for everybody). Thomas
On 12/8/21 18:02, Cornelia Huck wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > 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(-) This is a good idea to add all new compat machines as a single patch.
Cornelia Huck <cohuck@redhat.com> wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> I did a similar one with 6.3 by error, I think we should get a script to do this everytime that we increase the version number O:-) Later, Juan.
On Wed, Dec 08 2021, Cornelia Huck <cohuck@redhat.com> wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > 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/i386/pc.c b/hw/i386/pc.c > index a2ef40ecbc24..fccde2ef39f6 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -94,6 +94,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_6_2[] = {}; > +const size_t pc_compat_6_2_len = G_N_ELEMENTS(pc_compat_6_2); > + > GlobalProperty pc_compat_6_1[] = { > { TYPE_X86_CPU, "hv-version-id-build", "0x1bbc" }, > { TYPE_X86_CPU, "hv-version-id-major", "0x0006" }, > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 223dd3e05d15..b03026bf0648 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_6_2_machine_options(MachineClass *m) > +static void pc_i440fx_7_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, > + pc_i440fx_7_0_machine_options); > + > +static void pc_i440fx_6_2_machine_options(MachineClass *m) > +{ > + pc_i440fx_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > +} > + > DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, > pc_i440fx_6_2_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index e1e100316d93..6b66eb16bb64 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_6_2_machine_options(MachineClass *m) > +static void pc_q35_7_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, > + pc_q35_7_0_machine_options); > + > +static void pc_q35_6_2_machine_options(MachineClass *m) > +{ > + pc_q35_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > +} > + > DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, > pc_q35_6_2_machine_options); > So, this apparently causes some problems with one of the avocado tests: 162-tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias -> AssertionError: None != 'Cascadelake-Server-v1' : Cascadelake-Server must be an alias of Cascadelake-Server-v1 (full output at https://gitlab.com/qemu-project/qemu/-/jobs/1893456217) I have looked at the patch again and do not see what might be wrong (has something changed with the cpu model versioning recently?) Does anyone else (especially the x86 folks) have an idea?
On Fri, Dec 17, 2021 at 09:13:55AM +0100, Cornelia Huck wrote: > On Wed, Dec 08 2021, Cornelia Huck <cohuck@redhat.com> wrote: > > > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > --- > > 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/i386/pc_piix.c b/hw/i386/pc_piix.c > > index 223dd3e05d15..b03026bf0648 100644 > > --- a/hw/i386/pc_piix.c > > +++ b/hw/i386/pc_piix.c > > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > > } > > > > -static void pc_i440fx_6_2_machine_options(MachineClass *m) > > +static void pc_i440fx_7_0_machine_options(MachineClass *m) > > { > > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_i440fx_machine_options(m); > > @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m) > > pcmc->default_cpu_version = 1; > > } > > > > +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, > > + pc_i440fx_7_0_machine_options); > > + > > +static void pc_i440fx_6_2_machine_options(MachineClass *m) > > +{ > > + pc_i440fx_machine_options(m); Needs to be pc_i440fx_7_0_machine_options() > > + m->alias = NULL; > > + m->is_default = false; > > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > > +} > > + > > DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, > > pc_i440fx_6_2_machine_options); > > > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > > index e1e100316d93..6b66eb16bb64 100644 > > --- a/hw/i386/pc_q35.c > > +++ b/hw/i386/pc_q35.c > > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) > > m->max_cpus = 288; > > } > > > > -static void pc_q35_6_2_machine_options(MachineClass *m) > > +static void pc_q35_7_0_machine_options(MachineClass *m) > > { > > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_q35_machine_options(m); > > @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m) > > pcmc->default_cpu_version = 1; > > } > > > > +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, > > + pc_q35_7_0_machine_options); > > + > > +static void pc_q35_6_2_machine_options(MachineClass *m) > > +{ > > + pc_q35_machine_options(m); Needs to be pc_q35_7_0_machine_options() > > + m->alias = NULL; > > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > > +} > > + > > DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, > > pc_q35_6_2_machine_options); > > > > So, this apparently causes some problems with one of the avocado tests: > > 162-tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias -> AssertionError: None != 'Cascadelake-Server-v1' : Cascadelake-Server must be an alias of Cascadelake-Server-v1 > > (full output at https://gitlab.com/qemu-project/qemu/-/jobs/1893456217) > > I have looked at the patch again and do not see what might be wrong (has > something changed with the cpu model versioning recently?) > > Does anyone else (especially the x86 folks) have an idea? AFAICT, just a typo in chaining up the methods I've pointed out inline. Regards, Daniel
On Fri, Dec 17 2021, Daniel P. Berrangé <berrange@redhat.com> wrote: > On Fri, Dec 17, 2021 at 09:13:55AM +0100, Cornelia Huck wrote: >> On Wed, Dec 08 2021, Cornelia Huck <cohuck@redhat.com> wrote: >> >> > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. >> > >> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> >> > --- >> > 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/i386/pc_piix.c b/hw/i386/pc_piix.c >> > index 223dd3e05d15..b03026bf0648 100644 >> > --- a/hw/i386/pc_piix.c >> > +++ b/hw/i386/pc_piix.c >> > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) >> > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); >> > } >> > >> > -static void pc_i440fx_6_2_machine_options(MachineClass *m) >> > +static void pc_i440fx_7_0_machine_options(MachineClass *m) >> > { >> > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); >> > pc_i440fx_machine_options(m); >> > @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m) >> > pcmc->default_cpu_version = 1; >> > } >> > >> > +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, >> > + pc_i440fx_7_0_machine_options); >> > + >> > +static void pc_i440fx_6_2_machine_options(MachineClass *m) >> > +{ >> > + pc_i440fx_machine_options(m); > > Needs to be pc_i440fx_7_0_machine_options() > >> > + m->alias = NULL; >> > + m->is_default = false; >> > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); >> > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); >> > +} >> > + >> > DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, >> > pc_i440fx_6_2_machine_options); >> > >> > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c >> > index e1e100316d93..6b66eb16bb64 100644 >> > --- a/hw/i386/pc_q35.c >> > +++ b/hw/i386/pc_q35.c >> > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) >> > m->max_cpus = 288; >> > } >> > >> > -static void pc_q35_6_2_machine_options(MachineClass *m) >> > +static void pc_q35_7_0_machine_options(MachineClass *m) >> > { >> > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); >> > pc_q35_machine_options(m); >> > @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m) >> > pcmc->default_cpu_version = 1; >> > } >> > >> > +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, >> > + pc_q35_7_0_machine_options); >> > + >> > +static void pc_q35_6_2_machine_options(MachineClass *m) >> > +{ >> > + pc_q35_machine_options(m); > > Needs to be pc_q35_7_0_machine_options() > >> > + m->alias = NULL; >> > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); >> > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); >> > +} >> > + >> > DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, >> > pc_q35_6_2_machine_options); >> > >> >> So, this apparently causes some problems with one of the avocado tests: >> >> 162-tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias -> AssertionError: None != 'Cascadelake-Server-v1' : Cascadelake-Server must be an alias of Cascadelake-Server-v1 >> >> (full output at https://gitlab.com/qemu-project/qemu/-/jobs/1893456217) >> >> I have looked at the patch again and do not see what might be wrong (has >> something changed with the cpu model versioning recently?) >> >> Does anyone else (especially the x86 folks) have an idea? > > AFAICT, just a typo in chaining up the methods I've pointed out inline. Duh, indeed. Thanks for spotting this. Will send a v2.
On Fri, Dec 17, 2021 at 03:29:13PM +0100, Cornelia Huck wrote: > On Fri, Dec 17 2021, Daniel P. Berrangé <berrange@redhat.com> wrote: > > > On Fri, Dec 17, 2021 at 09:13:55AM +0100, Cornelia Huck wrote: > >> On Wed, Dec 08 2021, Cornelia Huck <cohuck@redhat.com> wrote: > >> > >> > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > >> > > >> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > >> > --- > >> > 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/i386/pc_piix.c b/hw/i386/pc_piix.c > >> > index 223dd3e05d15..b03026bf0648 100644 > >> > --- a/hw/i386/pc_piix.c > >> > +++ b/hw/i386/pc_piix.c > >> > @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > >> > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > >> > } > >> > > >> > -static void pc_i440fx_6_2_machine_options(MachineClass *m) > >> > +static void pc_i440fx_7_0_machine_options(MachineClass *m) > >> > { > >> > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > >> > pc_i440fx_machine_options(m); > >> > @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m) > >> > pcmc->default_cpu_version = 1; > >> > } > >> > > >> > +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, > >> > + pc_i440fx_7_0_machine_options); > >> > + > >> > +static void pc_i440fx_6_2_machine_options(MachineClass *m) > >> > +{ > >> > + pc_i440fx_machine_options(m); > > > > Needs to be pc_i440fx_7_0_machine_options() > > > >> > + m->alias = NULL; > >> > + m->is_default = false; > >> > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > >> > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > >> > +} > >> > + > >> > DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, > >> > pc_i440fx_6_2_machine_options); > >> > > >> > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > >> > index e1e100316d93..6b66eb16bb64 100644 > >> > --- a/hw/i386/pc_q35.c > >> > +++ b/hw/i386/pc_q35.c > >> > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) > >> > m->max_cpus = 288; > >> > } > >> > > >> > -static void pc_q35_6_2_machine_options(MachineClass *m) > >> > +static void pc_q35_7_0_machine_options(MachineClass *m) > >> > { > >> > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > >> > pc_q35_machine_options(m); > >> > @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m) > >> > pcmc->default_cpu_version = 1; > >> > } > >> > > >> > +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, > >> > + pc_q35_7_0_machine_options); > >> > + > >> > +static void pc_q35_6_2_machine_options(MachineClass *m) > >> > +{ > >> > + pc_q35_machine_options(m); > > > > Needs to be pc_q35_7_0_machine_options() > > > >> > + m->alias = NULL; > >> > + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); > >> > + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); > >> > +} > >> > + > >> > DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, > >> > pc_q35_6_2_machine_options); > >> > > >> > >> So, this apparently causes some problems with one of the avocado tests: > >> > >> 162-tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias -> AssertionError: None != 'Cascadelake-Server-v1' : Cascadelake-Server must be an alias of Cascadelake-Server-v1 > >> > >> (full output at https://gitlab.com/qemu-project/qemu/-/jobs/1893456217) > >> > >> I have looked at the patch again and do not see what might be wrong (has > >> something changed with the cpu model versioning recently?) > >> > >> Does anyone else (especially the x86 folks) have an idea? > > > > AFAICT, just a typo in chaining up the methods I've pointed out inline. > > Duh, indeed. Thanks for spotting this. > > Will send a v2. > > /me wonders if this patch could be generated with a "simple" script in order to avoid typos and/or forgetting lines. It seems like all architectures have pretty consistent patterns. Thanks, drew
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 30da05dfe040..ddcfab426436 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2857,10 +2857,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_7_0_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) + static void virt_machine_6_2_options(MachineClass *mc) { + virt_machine_7_0_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(6, 2) +DEFINE_VIRT_MACHINE(6, 2) static void virt_machine_6_1_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 53a99abc5605..a9c15479fe1d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -37,6 +37,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_6_2[] = {}; +const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); + GlobalProperty hw_compat_6_1[] = { { "vhost-user-vsock-device", "seqpacket", "off" }, { "nvme-ns", "shared", "off" }, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a2ef40ecbc24..fccde2ef39f6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -94,6 +94,9 @@ #include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_6_2[] = {}; +const size_t pc_compat_6_2_len = G_N_ELEMENTS(pc_compat_6_2); + GlobalProperty pc_compat_6_1[] = { { TYPE_X86_CPU, "hv-version-id-build", "0x1bbc" }, { TYPE_X86_CPU, "hv-version-id-major", "0x0006" }, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 223dd3e05d15..b03026bf0648 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -413,7 +413,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_i440fx_6_2_machine_options(MachineClass *m) +static void pc_i440fx_7_0_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -422,6 +422,18 @@ static void pc_i440fx_6_2_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, + pc_i440fx_7_0_machine_options); + +static void pc_i440fx_6_2_machine_options(MachineClass *m) +{ + pc_i440fx_machine_options(m); + m->alias = NULL; + m->is_default = false; + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); +} + DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL, pc_i440fx_6_2_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index e1e100316d93..6b66eb16bb64 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_6_2_machine_options(MachineClass *m) +static void pc_q35_7_0_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -368,6 +368,17 @@ static void pc_q35_6_2_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, + pc_q35_7_0_machine_options); + +static void pc_q35_6_2_machine_options(MachineClass *m) +{ + pc_q35_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len); + compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len); +} + DEFINE_Q35_MACHINE(v6_2, "pc-q35-6.2", NULL, pc_q35_6_2_machine_options); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 3b5fd749be89..837342932586 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4665,15 +4665,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-7.0 + */ +static void spapr_machine_7_0_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(7_0, "7.0", true); + /* * pseries-6.2 */ static void spapr_machine_6_2_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_7_0_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); } -DEFINE_SPAPR_MACHINE(6_2, "6.2", true); +DEFINE_SPAPR_MACHINE(6_2, "6.2", false); /* * pseries-6.1 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 653587ea62f4..84e3e63c430d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -791,14 +791,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_7_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_7_0_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(7_0, "7.0", true); + static void ccw_machine_6_2_instance_options(MachineState *machine) { + ccw_machine_7_0_instance_options(machine); } static void ccw_machine_6_2_class_options(MachineClass *mc) { + ccw_machine_7_0_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); } -DEFINE_CCW_MACHINE(6_2, "6.2", true); +DEFINE_CCW_MACHINE(6_2, "6.2", false); static void ccw_machine_6_1_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index 9c1c1901046c..b7b68471ffc1 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -375,6 +375,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_6_2[]; +extern const size_t hw_compat_6_2_len; + extern GlobalProperty hw_compat_6_1[]; extern const size_t hw_compat_6_1_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9ab39e428f80..b38947c224cd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -196,6 +196,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); +extern GlobalProperty pc_compat_6_2[]; +extern const size_t pc_compat_6_2_len; + extern GlobalProperty pc_compat_6_1[]; extern const size_t pc_compat_6_1_len;
Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Cornelia Huck <cohuck@redhat.com> --- 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(-)