Message ID | 20200728094645.272149-1-cohuck@redhat.com |
---|---|
State | New |
Headers | show |
Series | hw: add compat machines for 5.2 | expand |
On 28/07/2020 11.46, Cornelia Huck wrote: > Add 5.2 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(-) For the generic and s390x part: Acked-by: Thomas Huth <thuth@redhat.com>
On Tue, Jul 28, 2020 at 11:46:45AM +0200, Cornelia Huck wrote: > Add 5.2 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/arm/virt.c b/hw/arm/virt.c > index ecfee362a182..acf9bfbeceaf 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > + > static void virt_machine_5_1_options(MachineClass *mc) > { > + virt_machine_5_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > +DEFINE_VIRT_MACHINE(5, 1) > > static void virt_machine_5_0_options(MachineClass *mc) > { For the above hw/arm/virt.c part Reviewed-by: Andrew Jones <drjones@redhat.com>
On Tue, 28 Jul 2020 11:46:45 +0200 Cornelia Huck <cohuck@redhat.com> wrote: > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. > Heh, you win the race for adding new machine types again :) > 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 +++++++++++++-- For ppc parts: Reviewed-by: Greg Kurz <groug@kaod.org> > 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 ecfee362a182..acf9bfbeceaf 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > + > static void virt_machine_5_1_options(MachineClass *mc) > { > + virt_machine_5_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > +DEFINE_VIRT_MACHINE(5, 1) > > static void virt_machine_5_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 2f881d6d75b8..a24fe18ab6a6 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_1[] = {}; > +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); > + > GlobalProperty hw_compat_5_0[] = { > { "virtio-balloon-device", "page-poison", "false" }, > { "vmport", "x-read-set-eax", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3d419d599127..1733b5341a62 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > +GlobalProperty pc_compat_5_1[] = {}; > +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1); > + > GlobalProperty pc_compat_5_0[] = {}; > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b789e83f9acb..c5ba70ca17cb 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_5_1_machine_options(MachineClass *m) > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, > + pc_i440fx_5_2_machine_options); > + > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > pc_i440fx_5_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3e607a544a5..0cb9c18cd44d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_5_1_machine_options(MachineClass *m) > +static void pc_q35_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, > + pc_q35_5_2_machine_options); > + > +static void pc_q35_5_1_machine_options(MachineClass *m) > +{ > + pc_q35_5_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > pc_q35_5_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ae293ec9431..1c8d0981b382 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.2 > + */ > +static void spapr_machine_5_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); > + > /* > * pseries-5.1 > */ > static void spapr_machine_5_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > > -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); > > /* > * pseries-5.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 403d30e13bca..3dc22737a389 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -804,14 +804,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_5_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_2, "5.2", true); > + > static void ccw_machine_5_1_instance_options(MachineState *machine) > { > + ccw_machine_5_2_instance_options(machine); > } > > static void ccw_machine_5_1_class_options(MachineClass *mc) > { > + ccw_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_CCW_MACHINE(5_1, "5.1", true); > +DEFINE_CCW_MACHINE(5_1, "5.1", false); > > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 426ce5f625a4..bc5b82ad209e 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -319,6 +319,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_5_1[]; > +extern const size_t hw_compat_5_1_len; > + > extern GlobalProperty hw_compat_5_0[]; > extern const size_t hw_compat_5_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3d7ed3a55e30..fe52e165b27c 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -193,6 +193,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_1[]; > +extern const size_t pc_compat_5_1_len; > + > extern GlobalProperty pc_compat_5_0[]; > extern const size_t pc_compat_5_0_len; >
On Tue, Jul 28, 2020 at 11:46:45AM +0200, Cornelia Huck wrote: > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> ppc parts Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > 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 ecfee362a182..acf9bfbeceaf 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > + > static void virt_machine_5_1_options(MachineClass *mc) > { > + virt_machine_5_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > +DEFINE_VIRT_MACHINE(5, 1) > > static void virt_machine_5_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 2f881d6d75b8..a24fe18ab6a6 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_1[] = {}; > +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); > + > GlobalProperty hw_compat_5_0[] = { > { "virtio-balloon-device", "page-poison", "false" }, > { "vmport", "x-read-set-eax", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3d419d599127..1733b5341a62 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > +GlobalProperty pc_compat_5_1[] = {}; > +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1); > + > GlobalProperty pc_compat_5_0[] = {}; > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b789e83f9acb..c5ba70ca17cb 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_5_1_machine_options(MachineClass *m) > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, > + pc_i440fx_5_2_machine_options); > + > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > pc_i440fx_5_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3e607a544a5..0cb9c18cd44d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_5_1_machine_options(MachineClass *m) > +static void pc_q35_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, > + pc_q35_5_2_machine_options); > + > +static void pc_q35_5_1_machine_options(MachineClass *m) > +{ > + pc_q35_5_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > pc_q35_5_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ae293ec9431..1c8d0981b382 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.2 > + */ > +static void spapr_machine_5_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); > + > /* > * pseries-5.1 > */ > static void spapr_machine_5_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > > -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); > > /* > * pseries-5.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 403d30e13bca..3dc22737a389 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -804,14 +804,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_5_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_2, "5.2", true); > + > static void ccw_machine_5_1_instance_options(MachineState *machine) > { > + ccw_machine_5_2_instance_options(machine); > } > > static void ccw_machine_5_1_class_options(MachineClass *mc) > { > + ccw_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_CCW_MACHINE(5_1, "5.1", true); > +DEFINE_CCW_MACHINE(5_1, "5.1", false); > > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 426ce5f625a4..bc5b82ad209e 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -319,6 +319,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_5_1[]; > +extern const size_t hw_compat_5_1_len; > + > extern GlobalProperty hw_compat_5_0[]; > extern const size_t hw_compat_5_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3d7ed3a55e30..fe52e165b27c 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -193,6 +193,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_1[]; > +extern const size_t pc_compat_5_1_len; > + > extern GlobalProperty pc_compat_5_0[]; > extern const size_t pc_compat_5_0_len; >
On 28.07.20 11:46, Cornelia Huck wrote: > Add 5.2 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 +++++++++++++- Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > 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 ecfee362a182..acf9bfbeceaf 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > + > static void virt_machine_5_1_options(MachineClass *mc) > { > + virt_machine_5_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > +DEFINE_VIRT_MACHINE(5, 1) > > static void virt_machine_5_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 2f881d6d75b8..a24fe18ab6a6 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_1[] = {}; > +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); > + > GlobalProperty hw_compat_5_0[] = { > { "virtio-balloon-device", "page-poison", "false" }, > { "vmport", "x-read-set-eax", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3d419d599127..1733b5341a62 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > +GlobalProperty pc_compat_5_1[] = {}; > +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1); > + > GlobalProperty pc_compat_5_0[] = {}; > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b789e83f9acb..c5ba70ca17cb 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_5_1_machine_options(MachineClass *m) > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, > + pc_i440fx_5_2_machine_options); > + > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > pc_i440fx_5_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3e607a544a5..0cb9c18cd44d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_5_1_machine_options(MachineClass *m) > +static void pc_q35_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, > + pc_q35_5_2_machine_options); > + > +static void pc_q35_5_1_machine_options(MachineClass *m) > +{ > + pc_q35_5_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > pc_q35_5_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ae293ec9431..1c8d0981b382 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.2 > + */ > +static void spapr_machine_5_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); > + > /* > * pseries-5.1 > */ > static void spapr_machine_5_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > > -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); > > /* > * pseries-5.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 403d30e13bca..3dc22737a389 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -804,14 +804,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_5_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_2, "5.2", true); > + > static void ccw_machine_5_1_instance_options(MachineState *machine) > { > + ccw_machine_5_2_instance_options(machine); > } > > static void ccw_machine_5_1_class_options(MachineClass *mc) > { > + ccw_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_CCW_MACHINE(5_1, "5.1", true); > +DEFINE_CCW_MACHINE(5_1, "5.1", false); > > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 426ce5f625a4..bc5b82ad209e 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -319,6 +319,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_5_1[]; > +extern const size_t hw_compat_5_1_len; > + > extern GlobalProperty hw_compat_5_0[]; > extern const size_t hw_compat_5_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3d7ed3a55e30..fe52e165b27c 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -193,6 +193,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_1[]; > +extern const size_t pc_compat_5_1_len; > + > extern GlobalProperty pc_compat_5_0[]; > extern const size_t pc_compat_5_0_len; > >
On Tue, Jul 28, 2020 at 11:46:45AM +0200, Cornelia Huck wrote: > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> We merge this kind of thing after the release, right? > --- > 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 ecfee362a182..acf9bfbeceaf 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_5_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > + > static void virt_machine_5_1_options(MachineClass *mc) > { > + virt_machine_5_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > +DEFINE_VIRT_MACHINE(5, 1) > > static void virt_machine_5_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 2f881d6d75b8..a24fe18ab6a6 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_1[] = {}; > +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); > + > GlobalProperty hw_compat_5_0[] = { > { "virtio-balloon-device", "page-poison", "false" }, > { "vmport", "x-read-set-eax", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3d419d599127..1733b5341a62 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > +GlobalProperty pc_compat_5_1[] = {}; > +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1); > + > GlobalProperty pc_compat_5_0[] = {}; > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b789e83f9acb..c5ba70ca17cb 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_5_1_machine_options(MachineClass *m) > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, > + pc_i440fx_5_2_machine_options); > + > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > pc_i440fx_5_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3e607a544a5..0cb9c18cd44d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_5_1_machine_options(MachineClass *m) > +static void pc_q35_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, > + pc_q35_5_2_machine_options); > + > +static void pc_q35_5_1_machine_options(MachineClass *m) > +{ > + pc_q35_5_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > pc_q35_5_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ae293ec9431..1c8d0981b382 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-5.2 > + */ > +static void spapr_machine_5_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); > + > /* > * pseries-5.1 > */ > static void spapr_machine_5_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > > -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); > > /* > * pseries-5.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 403d30e13bca..3dc22737a389 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -804,14 +804,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_5_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_2, "5.2", true); > + > static void ccw_machine_5_1_instance_options(MachineState *machine) > { > + ccw_machine_5_2_instance_options(machine); > } > > static void ccw_machine_5_1_class_options(MachineClass *mc) > { > + ccw_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_CCW_MACHINE(5_1, "5.1", true); > +DEFINE_CCW_MACHINE(5_1, "5.1", false); > > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 426ce5f625a4..bc5b82ad209e 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -319,6 +319,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_5_1[]; > +extern const size_t hw_compat_5_1_len; > + > extern GlobalProperty hw_compat_5_0[]; > extern const size_t hw_compat_5_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3d7ed3a55e30..fe52e165b27c 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -193,6 +193,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_1[]; > +extern const size_t pc_compat_5_1_len; > + > extern GlobalProperty pc_compat_5_0[]; > extern const size_t pc_compat_5_0_len; > > -- > 2.25.4
On Wed, 29 Jul 2020 10:10:56 -0400 "Michael S. Tsirkin" <mst@redhat.com> wrote: > On Tue, Jul 28, 2020 at 11:46:45AM +0200, Cornelia Huck wrote: > > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. > > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > > We merge this kind of thing after the release, right? I guess the first person to do an arch pull request for 5.2 gets to merge this. (I don't have much for s390 yet, so probably someone else.) > > > > --- > > 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 ecfee362a182..acf9bfbeceaf 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_5_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) + static void virt_machine_5_1_options(MachineClass *mc) { + virt_machine_5_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) +DEFINE_VIRT_MACHINE(5, 1) static void virt_machine_5_0_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 2f881d6d75b8..a24fe18ab6a6 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_1[] = {}; +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); + GlobalProperty hw_compat_5_0[] = { { "virtio-balloon-device", "page-poison", "false" }, { "vmport", "x-read-set-eax", "off" }, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3d419d599127..1733b5341a62 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -97,6 +97,9 @@ #include "fw_cfg.h" #include "trace.h" +GlobalProperty pc_compat_5_1[] = {}; +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1); + GlobalProperty pc_compat_5_0[] = {}; const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b789e83f9acb..c5ba70ca17cb 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_i440fx_5_1_machine_options(MachineClass *m) +static void pc_i440fx_5_2_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, + pc_i440fx_5_2_machine_options); + +static void pc_i440fx_5_1_machine_options(MachineClass *m) +{ + pc_i440fx_5_2_machine_options(m); + m->alias = NULL; + m->is_default = false; + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); +} + DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, pc_i440fx_5_1_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a3e607a544a5..0cb9c18cd44d 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_5_1_machine_options(MachineClass *m) +static void pc_q35_5_2_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, + pc_q35_5_2_machine_options); + +static void pc_q35_5_1_machine_options(MachineClass *m) +{ + pc_q35_5_2_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); +} + DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, pc_q35_5_1_machine_options); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0ae293ec9431..1c8d0981b382 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-5.2 + */ +static void spapr_machine_5_2_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); + /* * pseries-5.1 */ static void spapr_machine_5_1_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_5_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); /* * pseries-5.0 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 403d30e13bca..3dc22737a389 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -804,14 +804,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); + static void ccw_machine_5_1_instance_options(MachineState *machine) { + ccw_machine_5_2_instance_options(machine); } static void ccw_machine_5_1_class_options(MachineClass *mc) { + ccw_machine_5_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false); static void ccw_machine_5_0_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index 426ce5f625a4..bc5b82ad209e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -319,6 +319,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_5_1[]; +extern const size_t hw_compat_5_1_len; + extern GlobalProperty hw_compat_5_0[]; extern const size_t hw_compat_5_0_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3d7ed3a55e30..fe52e165b27c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -193,6 +193,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_1[]; +extern const size_t pc_compat_5_1_len; + extern GlobalProperty pc_compat_5_0[]; extern const size_t pc_compat_5_0_len;
Add 5.2 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(-)