| Message ID | 20211217143948.289995-1-cohuck@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] hw: Add compat machines for 7.0 | expand |
Am 17.12.21 um 15:39 schrieb Cornelia Huck: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Acked-by: Cédric Le Goater <clg@kaod.org> > Reviewed-by: Juan Quintela <quintela@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> s390 parts Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > > v1->v2: fix typo in i386 function chaining (thanks danpb!) > > --- > 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 6bce595aba20..4593fea1ce8a 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2856,10 +2856,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..19991902761e 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_7_0_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..2e981f436ce5 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_7_0_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 Fri, Dec 17, 2021 at 03:39:48PM +0100, Cornelia Huck wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Acked-by: Cédric Le Goater <clg@kaod.org> > Reviewed-by: Juan Quintela <quintela@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > > v1->v2: fix typo in i386 function chaining (thanks danpb!) > > --- > 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(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
On Fri, Dec 17, 2021 at 03:39:48PM +0100, Cornelia Huck wrote: > Add 7.0 machine types for arm/i440fx/q35/s390x/spapr. > > Acked-by: Cédric Le Goater <clg@kaod.org> > Reviewed-by: Juan Quintela <quintela@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > > v1->v2: fix typo in i386 function chaining (thanks danpb!) > > --- > 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 6bce595aba20..4593fea1ce8a 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2856,10 +2856,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) > { For the arm parts Reviewed-by: Andrew Jones <drjones@redhat.com>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6bce595aba20..4593fea1ce8a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2856,10 +2856,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..19991902761e 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_7_0_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..2e981f436ce5 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_7_0_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;