| Message ID | 20230718142235.135319-1-cohuck@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Add compat machines for 8.2 | expand |
Le 18/07/2023 à 16:22, Cornelia Huck a écrit : > Add 8.2 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 | 16 +++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > 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(+), 10 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 7d9dbc26633a..2a560271b5fc 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3170,10 +3170,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_8_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(8, 2) > + > static void virt_machine_8_1_options(MachineClass *mc) > { > + virt_machine_8_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(8, 1) > +DEFINE_VIRT_MACHINE(8, 1) > > static void virt_machine_8_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index f0d35c640184..da699cf4e147 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -39,6 +39,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_8_1[] = {}; > +const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1); > + > GlobalProperty hw_compat_8_0[] = { > { "migration", "multifd-flush-after-each-section", "on"}, > { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3109d5e0e035..54838c0c411d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -114,6 +114,9 @@ > { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ > { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, > > +GlobalProperty pc_compat_8_1[] = {}; > +const size_t pc_compat_8_1_len = G_N_ELEMENTS(pc_compat_8_1); > + > GlobalProperty pc_compat_8_0[] = { > { "virtio-mem", "unplugged-inaccessible", "auto" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index ac72e8f5bee1..ce1ac9527493 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -504,13 +504,25 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_8_1_machine_options(MachineClass *m) > +static void pc_i440fx_8_2_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias = "pc"; > m->is_default = true; > } > > +DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL, > + pc_i440fx_8_2_machine_options); > + > +static void pc_i440fx_8_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_8_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); > + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); > +} > + > DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL, > pc_i440fx_8_1_machine_options); > > @@ -519,8 +531,6 @@ static void pc_i440fx_8_0_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_i440fx_8_1_machine_options(m); > - m->alias = NULL; > - m->is_default = false; > compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); > compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index dc27a9e223a2..37c4814bedf2 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -379,12 +379,23 @@ static void pc_q35_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_q35_8_1_machine_options(MachineClass *m) > +static void pc_q35_8_2_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias = "q35"; > } > > +DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL, > + pc_q35_8_2_machine_options); > + > +static void pc_q35_8_1_machine_options(MachineClass *m) > +{ > + pc_q35_8_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); > + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); > +} > + > DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL, > pc_q35_8_1_machine_options); > > @@ -393,7 +404,6 @@ static void pc_q35_8_0_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_q35_8_1_machine_options(m); > - m->alias = NULL; > compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); > compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); > > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 731205b215b2..a0813f75c060 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -347,10 +347,17 @@ type_init(virt_machine_register_types) > } \ > type_init(machvirt_machine_##major##_##minor##_init); > > +static void virt_machine_8_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE(8, 2, true) > + > static void virt_machine_8_1_options(MachineClass *mc) > { > + virt_machine_8_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_VIRT_MACHINE(8, 1, true) > +DEFINE_VIRT_MACHINE(8, 1, false) > > static void virt_machine_8_0_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1c8b8d57a70a..622fea825605 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4752,15 +4752,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-8.2 > + */ > +static void spapr_machine_8_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(8_2, "8.2", true); > + > /* > * pseries-8.1 > */ > static void spapr_machine_8_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > > -DEFINE_SPAPR_MACHINE(8_1, "8.1", true); > +DEFINE_SPAPR_MACHINE(8_1, "8.1", false); > > /* > * pseries-8.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 4516d73ff5fc..c52a1fcf6700 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -828,14 +828,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_8_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_8_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(8_2, "8.2", true); > + > static void ccw_machine_8_1_instance_options(MachineState *machine) > { > + ccw_machine_8_2_instance_options(machine); > } > > static void ccw_machine_8_1_class_options(MachineClass *mc) > { > + ccw_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_CCW_MACHINE(8_1, "8.1", true); > +DEFINE_CCW_MACHINE(8_1, "8.1", false); > > static void ccw_machine_8_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index ed8336019801..3b541ffd2472 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -390,6 +390,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_8_1[]; > +extern const size_t hw_compat_8_1_len; > + > extern GlobalProperty hw_compat_8_0[]; > extern const size_t hw_compat_8_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index d54e8b1101e4..0fabece236cf 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -200,6 +200,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_8_1[]; > +extern const size_t pc_compat_8_1_len; > + > extern GlobalProperty pc_compat_8_0[]; > extern const size_t pc_compat_8_0_len; > For m68k part: Acked-by: Laurent Vivier <laurent@vivier.eu>
On Tue, Jul 18, 2023 at 04:22:35PM +0200, Cornelia Huck wrote: > Add 8.2 machine types for arm/i440fx/m68k/q35/s390x/spapr. > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 16 +++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > 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(+), 10 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 7d9dbc26633a..2a560271b5fc 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3170,10 +3170,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_8_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(8, 2) > + > static void virt_machine_8_1_options(MachineClass *mc) > { > + virt_machine_8_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(8, 1) > +DEFINE_VIRT_MACHINE(8, 1) > > static void virt_machine_8_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index f0d35c640184..da699cf4e147 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -39,6 +39,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_8_1[] = {}; > +const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1); > + > GlobalProperty hw_compat_8_0[] = { > { "migration", "multifd-flush-after-each-section", "on"}, > { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3109d5e0e035..54838c0c411d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -114,6 +114,9 @@ > { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ > { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, > > +GlobalProperty pc_compat_8_1[] = {}; > +const size_t pc_compat_8_1_len = G_N_ELEMENTS(pc_compat_8_1); > + > GlobalProperty pc_compat_8_0[] = { > { "virtio-mem", "unplugged-inaccessible", "auto" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index ac72e8f5bee1..ce1ac9527493 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -504,13 +504,25 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_8_1_machine_options(MachineClass *m) > +static void pc_i440fx_8_2_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias = "pc"; > m->is_default = true; > } > > +DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL, > + pc_i440fx_8_2_machine_options); > + > +static void pc_i440fx_8_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_8_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); > + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); > +} > + > DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL, > pc_i440fx_8_1_machine_options); > > @@ -519,8 +531,6 @@ static void pc_i440fx_8_0_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_i440fx_8_1_machine_options(m); > - m->alias = NULL; > - m->is_default = false; > compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); > compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index dc27a9e223a2..37c4814bedf2 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -379,12 +379,23 @@ static void pc_q35_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_q35_8_1_machine_options(MachineClass *m) > +static void pc_q35_8_2_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias = "q35"; > } > > +DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL, > + pc_q35_8_2_machine_options); > + > +static void pc_q35_8_1_machine_options(MachineClass *m) > +{ > + pc_q35_8_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); > + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); > +} > + > DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL, > pc_q35_8_1_machine_options); > > @@ -393,7 +404,6 @@ static void pc_q35_8_0_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_q35_8_1_machine_options(m); > - m->alias = NULL; > compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); > compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); > > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 731205b215b2..a0813f75c060 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -347,10 +347,17 @@ type_init(virt_machine_register_types) > } \ > type_init(machvirt_machine_##major##_##minor##_init); > > +static void virt_machine_8_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE(8, 2, true) > + > static void virt_machine_8_1_options(MachineClass *mc) > { > + virt_machine_8_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_VIRT_MACHINE(8, 1, true) > +DEFINE_VIRT_MACHINE(8, 1, false) > > static void virt_machine_8_0_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1c8b8d57a70a..622fea825605 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4752,15 +4752,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-8.2 > + */ > +static void spapr_machine_8_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(8_2, "8.2", true); > + > /* > * pseries-8.1 > */ > static void spapr_machine_8_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > > -DEFINE_SPAPR_MACHINE(8_1, "8.1", true); > +DEFINE_SPAPR_MACHINE(8_1, "8.1", false); > > /* > * pseries-8.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 4516d73ff5fc..c52a1fcf6700 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -828,14 +828,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_8_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_8_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(8_2, "8.2", true); > + > static void ccw_machine_8_1_instance_options(MachineState *machine) > { > + ccw_machine_8_2_instance_options(machine); > } > > static void ccw_machine_8_1_class_options(MachineClass *mc) > { > + ccw_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_CCW_MACHINE(8_1, "8.1", true); > +DEFINE_CCW_MACHINE(8_1, "8.1", false); > > static void ccw_machine_8_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index ed8336019801..3b541ffd2472 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -390,6 +390,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_8_1[]; > +extern const size_t hw_compat_8_1_len; > + > extern GlobalProperty hw_compat_8_0[]; > extern const size_t hw_compat_8_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index d54e8b1101e4..0fabece236cf 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -200,6 +200,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_8_1[]; > +extern const size_t pc_compat_8_1_len; > + > extern GlobalProperty pc_compat_8_0[]; > extern const size_t pc_compat_8_0_len; > > -- > 2.41.0
On 7/18/23 16:22, Cornelia Huck wrote: > Add 8.2 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 | 16 +++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > 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(+), 10 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 7d9dbc26633a..2a560271b5fc 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3170,10 +3170,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_8_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(8, 2) > + > static void virt_machine_8_1_options(MachineClass *mc) > { > + virt_machine_8_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(8, 1) > +DEFINE_VIRT_MACHINE(8, 1) > > static void virt_machine_8_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index f0d35c640184..da699cf4e147 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -39,6 +39,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_8_1[] = {}; > +const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1); > + > GlobalProperty hw_compat_8_0[] = { > { "migration", "multifd-flush-after-each-section", "on"}, > { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3109d5e0e035..54838c0c411d 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -114,6 +114,9 @@ > { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ > { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, > > +GlobalProperty pc_compat_8_1[] = {}; > +const size_t pc_compat_8_1_len = G_N_ELEMENTS(pc_compat_8_1); > + > GlobalProperty pc_compat_8_0[] = { > { "virtio-mem", "unplugged-inaccessible", "auto" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index ac72e8f5bee1..ce1ac9527493 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -504,13 +504,25 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_8_1_machine_options(MachineClass *m) > +static void pc_i440fx_8_2_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias = "pc"; > m->is_default = true; > } > > +DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL, > + pc_i440fx_8_2_machine_options); > + > +static void pc_i440fx_8_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_8_2_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); > + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); > +} > + > DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL, > pc_i440fx_8_1_machine_options); > > @@ -519,8 +531,6 @@ static void pc_i440fx_8_0_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_i440fx_8_1_machine_options(m); > - m->alias = NULL; > - m->is_default = false; > compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); > compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index dc27a9e223a2..37c4814bedf2 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -379,12 +379,23 @@ static void pc_q35_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_q35_8_1_machine_options(MachineClass *m) > +static void pc_q35_8_2_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias = "q35"; > } > > +DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL, > + pc_q35_8_2_machine_options); > + > +static void pc_q35_8_1_machine_options(MachineClass *m) > +{ > + pc_q35_8_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); > + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); > +} > + > DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL, > pc_q35_8_1_machine_options); > > @@ -393,7 +404,6 @@ static void pc_q35_8_0_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > pc_q35_8_1_machine_options(m); > - m->alias = NULL; > compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); > compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); > > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 731205b215b2..a0813f75c060 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -347,10 +347,17 @@ type_init(virt_machine_register_types) > } \ > type_init(machvirt_machine_##major##_##minor##_init); > > +static void virt_machine_8_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE(8, 2, true) > + > static void virt_machine_8_1_options(MachineClass *mc) > { > + virt_machine_8_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_VIRT_MACHINE(8, 1, true) > +DEFINE_VIRT_MACHINE(8, 1, false) > > static void virt_machine_8_0_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1c8b8d57a70a..622fea825605 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4752,15 +4752,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-8.2 > + */ > +static void spapr_machine_8_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(8_2, "8.2", true); > + > /* > * pseries-8.1 > */ > static void spapr_machine_8_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > > -DEFINE_SPAPR_MACHINE(8_1, "8.1", true); > +DEFINE_SPAPR_MACHINE(8_1, "8.1", false); > > /* > * pseries-8.0 For pseries, Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 4516d73ff5fc..c52a1fcf6700 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -828,14 +828,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_8_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_8_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(8_2, "8.2", true); > + > static void ccw_machine_8_1_instance_options(MachineState *machine) > { > + ccw_machine_8_2_instance_options(machine); > } > > static void ccw_machine_8_1_class_options(MachineClass *mc) > { > + ccw_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_CCW_MACHINE(8_1, "8.1", true); > +DEFINE_CCW_MACHINE(8_1, "8.1", false); > > static void ccw_machine_8_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index ed8336019801..3b541ffd2472 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -390,6 +390,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_8_1[]; > +extern const size_t hw_compat_8_1_len; > + > extern GlobalProperty hw_compat_8_0[]; > extern const size_t hw_compat_8_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index d54e8b1101e4..0fabece236cf 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -200,6 +200,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_8_1[]; > +extern const size_t pc_compat_8_1_len; > + > extern GlobalProperty pc_compat_8_0[]; > extern const size_t pc_compat_8_0_len; >
On 18/07/2023 16.22, Cornelia Huck wrote: > Add 8.2 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 | 16 +++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > 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(+), 10 deletions(-) ... > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 4516d73ff5fc..c52a1fcf6700 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -828,14 +828,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_8_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_8_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(8_2, "8.2", true); > + > static void ccw_machine_8_1_instance_options(MachineState *machine) > { > + ccw_machine_8_2_instance_options(machine); > } > > static void ccw_machine_8_1_class_options(MachineClass *mc) > { > + ccw_machine_8_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); > } > -DEFINE_CCW_MACHINE(8_1, "8.1", true); > +DEFINE_CCW_MACHINE(8_1, "8.1", false); > > static void ccw_machine_8_0_instance_options(MachineState *machine) > { s390 part: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7d9dbc26633a..2a560271b5fc 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3170,10 +3170,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_8_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(8, 2) + static void virt_machine_8_1_options(MachineClass *mc) { + virt_machine_8_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(8, 1) +DEFINE_VIRT_MACHINE(8, 1) static void virt_machine_8_0_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index f0d35c640184..da699cf4e147 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,6 +39,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" +GlobalProperty hw_compat_8_1[] = {}; +const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1); + GlobalProperty hw_compat_8_0[] = { { "migration", "multifd-flush-after-each-section", "on"}, { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" }, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3109d5e0e035..54838c0c411d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -114,6 +114,9 @@ { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, +GlobalProperty pc_compat_8_1[] = {}; +const size_t pc_compat_8_1_len = G_N_ELEMENTS(pc_compat_8_1); + GlobalProperty pc_compat_8_0[] = { { "virtio-mem", "unplugged-inaccessible", "auto" }, }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ac72e8f5bee1..ce1ac9527493 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -504,13 +504,25 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_i440fx_8_1_machine_options(MachineClass *m) +static void pc_i440fx_8_2_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = true; } +DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL, + pc_i440fx_8_2_machine_options); + +static void pc_i440fx_8_1_machine_options(MachineClass *m) +{ + pc_i440fx_8_2_machine_options(m); + m->alias = NULL; + m->is_default = false; + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); +} + DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL, pc_i440fx_8_1_machine_options); @@ -519,8 +531,6 @@ static void pc_i440fx_8_0_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_8_1_machine_options(m); - m->alias = NULL; - m->is_default = false; compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index dc27a9e223a2..37c4814bedf2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -379,12 +379,23 @@ static void pc_q35_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } -static void pc_q35_8_1_machine_options(MachineClass *m) +static void pc_q35_8_2_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; } +DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL, + pc_q35_8_2_machine_options); + +static void pc_q35_8_1_machine_options(MachineClass *m) +{ + pc_q35_8_2_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len); + compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len); +} + DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL, pc_q35_8_1_machine_options); @@ -393,7 +404,6 @@ static void pc_q35_8_0_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_8_1_machine_options(m); - m->alias = NULL; compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 731205b215b2..a0813f75c060 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -347,10 +347,17 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_8_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(8, 2, true) + static void virt_machine_8_1_options(MachineClass *mc) { + virt_machine_8_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); } -DEFINE_VIRT_MACHINE(8, 1, true) +DEFINE_VIRT_MACHINE(8, 1, false) static void virt_machine_8_0_options(MachineClass *mc) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 1c8b8d57a70a..622fea825605 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4752,15 +4752,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-8.2 + */ +static void spapr_machine_8_2_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(8_2, "8.2", true); + /* * pseries-8.1 */ static void spapr_machine_8_1_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_8_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); } -DEFINE_SPAPR_MACHINE(8_1, "8.1", true); +DEFINE_SPAPR_MACHINE(8_1, "8.1", false); /* * pseries-8.0 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4516d73ff5fc..c52a1fcf6700 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -828,14 +828,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_8_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_8_2_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(8_2, "8.2", true); + static void ccw_machine_8_1_instance_options(MachineState *machine) { + ccw_machine_8_2_instance_options(machine); } static void ccw_machine_8_1_class_options(MachineClass *mc) { + ccw_machine_8_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); } -DEFINE_CCW_MACHINE(8_1, "8.1", true); +DEFINE_CCW_MACHINE(8_1, "8.1", false); static void ccw_machine_8_0_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index ed8336019801..3b541ffd2472 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -390,6 +390,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_8_1[]; +extern const size_t hw_compat_8_1_len; + extern GlobalProperty hw_compat_8_0[]; extern const size_t hw_compat_8_0_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d54e8b1101e4..0fabece236cf 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -200,6 +200,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); +extern GlobalProperty pc_compat_8_1[]; +extern const size_t pc_compat_8_1_len; + extern GlobalProperty pc_compat_8_0[]; extern const size_t pc_compat_8_0_len;
Add 8.2 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 | 16 +++++++++++++--- hw/i386/pc_q35.c | 14 ++++++++++++-- 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(+), 10 deletions(-)