| Message ID | 20220316145521.1224083-1-cohuck@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-7.1] hw: Add compat machines for 7.1 | expand |
On 3/16/22 15:55, Cornelia Huck wrote: > Add 7.1 machine types for arm/i440fx/m68k/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/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 79 insertions(+), 7 deletions(-) For the PPC part: Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C.
Le 16/03/2022 à 15:55, Cornelia Huck a écrit : > Add 7.1 machine types for arm/i440fx/m68k/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/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 79 insertions(+), 7 deletions(-) > ... > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index bbaf630bbf20..afa52d7e491e 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -316,10 +316,17 @@ type_init(virt_machine_register_types) > } \ > type_init(machvirt_machine_##major##_##minor##_init); > > +static void virt_machine_7_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE(7, 1, true) > + > static void virt_machine_7_0_options(MachineClass *mc) > { > + virt_machine_7_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_VIRT_MACHINE(7, 0, true) > +DEFINE_VIRT_MACHINE(7, 0, false) > > static void virt_machine_6_2_options(MachineClass *mc) > { For the m68k part: Acked-by: Laurent Vivier <laurent@vivier.eu>
On 16/03/2022 15.55, Cornelia Huck wrote: > Add 7.1 machine types for arm/i440fx/m68k/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/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 79 insertions(+), 7 deletions(-) ... > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 90480e7cf9bc..c3eab13c60e8 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_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_7_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(7_1, "7.1", true); > + > static void ccw_machine_7_0_instance_options(MachineState *machine) > { > + ccw_machine_7_1_instance_options(machine); > } > > static void ccw_machine_7_0_class_options(MachineClass *mc) > { > + ccw_machine_7_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_CCW_MACHINE(7_0, "7.0", true); > +DEFINE_CCW_MACHINE(7_0, "7.0", false); > > static void ccw_machine_6_2_instance_options(MachineState *machine) > { Acked-by: Thomas Huth <thuth@redhat.com>
Hi Connie, On 3/16/22 3:55 PM, Cornelia Huck wrote: > Add 7.1 machine types for arm/i440fx/m68k/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/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 79 insertions(+), 7 deletions(-) for the arm part: Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 46a42502bc55..2e6b4aac8c75 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3017,10 +3017,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_7_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(7, 1) > + > static void virt_machine_7_0_options(MachineClass *mc) > { > + virt_machine_7_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) > +DEFINE_VIRT_MACHINE(7, 0) > > static void virt_machine_6_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d856485cb4d0..cb9c05a7ded7 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_7_0[] = {}; > +const size_t hw_compat_7_0_len = G_N_ELEMENTS(hw_compat_7_0); > + > GlobalProperty hw_compat_6_2[] = {}; > const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index fd55fc725caf..23bba9d82c12 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -95,6 +95,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_7_0[] = {}; > +const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0); > + > GlobalProperty pc_compat_6_2[] = { > { "virtio-mem", "unplugged-inaccessible", "off" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b72c03d0a626..4c185c72d014 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_7_0_machine_options(MachineClass *m) > +static void pc_i440fx_7_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL, > + pc_i440fx_7_1_machine_options); > + > +static void pc_i440fx_7_0_machine_options(MachineClass *m) > +{ > + pc_i440fx_7_1_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); > + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); > +} > + > DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, > pc_i440fx_7_0_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 1780f79bc127..302288342a91 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_7_0_machine_options(MachineClass *m) > +static void pc_q35_7_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL, > + pc_q35_7_1_machine_options); > + > +static void pc_q35_7_0_machine_options(MachineClass *m) > +{ > + pc_q35_7_1_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); > + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); > +} > + > DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, > pc_q35_7_0_machine_options); > > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index bbaf630bbf20..afa52d7e491e 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -316,10 +316,17 @@ type_init(virt_machine_register_types) > } \ > type_init(machvirt_machine_##major##_##minor##_init); > > +static void virt_machine_7_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE(7, 1, true) > + > static void virt_machine_7_0_options(MachineClass *mc) > { > + virt_machine_7_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_VIRT_MACHINE(7, 0, true) > +DEFINE_VIRT_MACHINE(7, 0, false) > > static void virt_machine_6_2_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 953fc65fa863..3561882d6615 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4703,15 +4703,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-7.1 > + */ > +static void spapr_machine_7_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(7_1, "7.1", true); > + > /* > * pseries-7.0 > */ > static void spapr_machine_7_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_7_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > > -DEFINE_SPAPR_MACHINE(7_0, "7.0", true); > +DEFINE_SPAPR_MACHINE(7_0, "7.0", false); > > /* > * pseries-6.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 90480e7cf9bc..c3eab13c60e8 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_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_7_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(7_1, "7.1", true); > + > static void ccw_machine_7_0_instance_options(MachineState *machine) > { > + ccw_machine_7_1_instance_options(machine); > } > > static void ccw_machine_7_0_class_options(MachineClass *mc) > { > + ccw_machine_7_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_CCW_MACHINE(7_0, "7.0", true); > +DEFINE_CCW_MACHINE(7_0, "7.0", false); > > static void ccw_machine_6_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index c92ac8815c85..d64b5481e834 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -380,6 +380,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_7_0[]; > +extern const size_t hw_compat_7_0_len; > + > extern GlobalProperty hw_compat_6_2[]; > extern const size_t hw_compat_6_2_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 1a27de9c8b35..637367dc5fae 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -202,6 +202,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_7_0[]; > +extern const size_t pc_compat_7_0_len; > + > extern GlobalProperty pc_compat_6_2[]; > extern const size_t pc_compat_6_2_len; > >
On Wed, 2022-03-16 at 15:55 +0100, Cornelia Huck wrote: > Add 7.1 machine types for arm/i440fx/m68k/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/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 79 insertions(+), 7 deletions(-) > For s390x: Reviewed-by: Eric Farman <farman@linux.ibm.com> ..snip...
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 46a42502bc55..2e6b4aac8c75 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3017,10 +3017,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_7_1_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(7, 1) + static void virt_machine_7_0_options(MachineClass *mc) { + virt_machine_7_1_options(mc); + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) +DEFINE_VIRT_MACHINE(7, 0) static void virt_machine_6_2_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index d856485cb4d0..cb9c05a7ded7 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_7_0[] = {}; +const size_t hw_compat_7_0_len = G_N_ELEMENTS(hw_compat_7_0); + GlobalProperty hw_compat_6_2[] = {}; const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fd55fc725caf..23bba9d82c12 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -95,6 +95,9 @@ #include "trace.h" #include CONFIG_DEVICES +GlobalProperty pc_compat_7_0[] = {}; +const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0); + GlobalProperty pc_compat_6_2[] = { { "virtio-mem", "unplugged-inaccessible", "off" }, }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b72c03d0a626..4c185c72d014 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_i440fx_7_0_machine_options(MachineClass *m) +static void pc_i440fx_7_1_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL, + pc_i440fx_7_1_machine_options); + +static void pc_i440fx_7_0_machine_options(MachineClass *m) +{ + pc_i440fx_7_1_machine_options(m); + m->alias = NULL; + m->is_default = false; + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); +} + DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, pc_i440fx_7_0_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 1780f79bc127..302288342a91 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_7_0_machine_options(MachineClass *m) +static void pc_q35_7_1_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL, + pc_q35_7_1_machine_options); + +static void pc_q35_7_0_machine_options(MachineClass *m) +{ + pc_q35_7_1_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); +} + DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, pc_q35_7_0_machine_options); diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index bbaf630bbf20..afa52d7e491e 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -316,10 +316,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_7_1_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(7, 1, true) + static void virt_machine_7_0_options(MachineClass *mc) { + virt_machine_7_1_options(mc); + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_VIRT_MACHINE(7, 0, true) +DEFINE_VIRT_MACHINE(7, 0, false) static void virt_machine_6_2_options(MachineClass *mc) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 953fc65fa863..3561882d6615 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4703,15 +4703,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-7.1 + */ +static void spapr_machine_7_1_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(7_1, "7.1", true); + /* * pseries-7.0 */ static void spapr_machine_7_0_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_7_1_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_SPAPR_MACHINE(7_0, "7.0", true); +DEFINE_SPAPR_MACHINE(7_0, "7.0", false); /* * pseries-6.2 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 90480e7cf9bc..c3eab13c60e8 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_1_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_7_1_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(7_1, "7.1", true); + static void ccw_machine_7_0_instance_options(MachineState *machine) { + ccw_machine_7_1_instance_options(machine); } static void ccw_machine_7_0_class_options(MachineClass *mc) { + ccw_machine_7_1_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); } -DEFINE_CCW_MACHINE(7_0, "7.0", true); +DEFINE_CCW_MACHINE(7_0, "7.0", false); static void ccw_machine_6_2_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index c92ac8815c85..d64b5481e834 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -380,6 +380,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_7_0[]; +extern const size_t hw_compat_7_0_len; + extern GlobalProperty hw_compat_6_2[]; extern const size_t hw_compat_6_2_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1a27de9c8b35..637367dc5fae 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -202,6 +202,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); +extern GlobalProperty pc_compat_7_0[]; +extern const size_t pc_compat_7_0_len; + extern GlobalProperty pc_compat_6_2[]; extern const size_t pc_compat_6_2_len;
Add 7.1 machine types for arm/i440fx/m68k/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/m68k/virt.c | 9 ++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 10 files changed, 79 insertions(+), 7 deletions(-)