On Tue, Aug 05, 2025 at 11:56:16AM +0200, Cornelia Huck wrote:
> Add 10.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <coh...@redhat.com>
Acked-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 13 +++++++++++--
> 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, 76 insertions(+), 9 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ef6be3660f5f..9326cfc895f7 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3455,10 +3455,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_10_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(10, 2)
> +
> static void virt_machine_10_1_options(MachineClass *mc)
> {
> + virt_machine_10_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)
> +DEFINE_VIRT_MACHINE(10, 1)
>
> static void virt_machine_10_0_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index bd47527479a7..38c949c4f2ce 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -37,6 +37,9 @@
> #include "hw/virtio/virtio-iommu.h"
> #include "audio/audio.h"
>
> +GlobalProperty hw_compat_10_1[] = {};
> +const size_t hw_compat_10_1_len = G_N_ELEMENTS(hw_compat_10_1);
> +
> GlobalProperty hw_compat_10_0[] = {
> { "scsi-hd", "dpofua", "off" },
> { "vfio-pci", "x-migration-load-config-after-iter", "off" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 2f58e73d3347..bc048a6d1374 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -81,6 +81,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_10_1[] = {};
> +const size_t pc_compat_10_1_len = G_N_ELEMENTS(pc_compat_10_1);
> +
> GlobalProperty pc_compat_10_0[] = {
> { TYPE_X86_CPU, "x-consistent-cache", "false" },
> { TYPE_X86_CPU, "x-vendor-cpuid-only-v2", "false" },
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index c03324281bdb..d165ac72ed75 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -504,12 +504,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
> pc_piix_compat_defaults, pc_piix_compat_defaults_len);
> }
>
> -static void pc_i440fx_machine_10_1_options(MachineClass *m)
> +static void pc_i440fx_machine_10_2_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> }
>
> -DEFINE_I440FX_MACHINE_AS_LATEST(10, 1);
> +DEFINE_I440FX_MACHINE_AS_LATEST(10, 2);
> +
> +static void pc_i440fx_machine_10_1_options(MachineClass *m)
> +{
> + pc_i440fx_machine_10_2_options(m);
> + compat_props_add(m->compat_props, hw_compat_10_1, hw_compat_10_1_len);
> + compat_props_add(m->compat_props, pc_compat_10_1, pc_compat_10_1_len);
> +}
> +
> +DEFINE_I440FX_MACHINE(10, 1);
>
> static void pc_i440fx_machine_10_0_options(MachineClass *m)
> {
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index b309b2b378db..e89951285e58 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -374,12 +374,21 @@ static void pc_q35_machine_options(MachineClass *m)
> pc_q35_compat_defaults, pc_q35_compat_defaults_len);
> }
>
> -static void pc_q35_machine_10_1_options(MachineClass *m)
> +static void pc_q35_machine_10_2_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> }
>
> -DEFINE_Q35_MACHINE_AS_LATEST(10, 1);
> +DEFINE_Q35_MACHINE_AS_LATEST(10, 2);
> +
> +static void pc_q35_machine_10_1_options(MachineClass *m)
> +{
> + pc_q35_machine_10_2_options(m);
> + compat_props_add(m->compat_props, hw_compat_10_1, hw_compat_10_1_len);
> + compat_props_add(m->compat_props, pc_compat_10_1, pc_compat_10_1_len);
> +}
> +
> +DEFINE_Q35_MACHINE(10, 1);
>
> static void pc_q35_machine_10_0_options(MachineClass *m)
> {
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 875fd00ef8d2..98cfe43c73ae 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -367,10 +367,17 @@ type_init(virt_machine_register_types)
> #define DEFINE_VIRT_MACHINE(major, minor) \
> DEFINE_VIRT_MACHINE_IMPL(false, major, minor)
>
> +static void virt_machine_10_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(10, 2)
> +
> static void virt_machine_10_1_options(MachineClass *mc)
> {
> + virt_machine_10_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)
> +DEFINE_VIRT_MACHINE(10, 1)
>
> static void virt_machine_10_0_options(MachineClass *mc)
> {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 1855a3cd8d03..eb22333404d3 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4761,15 +4761,26 @@ static void
> spapr_machine_latest_class_options(MachineClass *mc)
> #define DEFINE_SPAPR_MACHINE(major, minor) \
> DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
>
> +/*
> + * pseries-10.2
> + */
> +static void spapr_machine_10_2_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE_AS_LATEST(10, 2);
> +
> /*
> * pseries-10.1
> */
> static void spapr_machine_10_1_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_10_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
> }
>
> -DEFINE_SPAPR_MACHINE_AS_LATEST(10, 1);
> +DEFINE_SPAPR_MACHINE(10, 1);
>
> /*
> * pseries-10.0
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index a79bd13275b9..d0c6e80cb050 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -911,14 +911,26 @@ static const TypeInfo ccw_machine_info = {
> DEFINE_CCW_MACHINE_IMPL(false, major, minor)
>
>
> +static void ccw_machine_10_2_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_10_2_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE_AS_LATEST(10, 2);
> +
> static void ccw_machine_10_1_instance_options(MachineState *machine)
> {
> + ccw_machine_10_2_instance_options(machine);
> }
>
> static void ccw_machine_10_1_class_options(MachineClass *mc)
> {
> + ccw_machine_10_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_1, hw_compat_10_1_len);
> }
> -DEFINE_CCW_MACHINE_AS_LATEST(10, 1);
> +DEFINE_CCW_MACHINE(10, 1);
>
> static void ccw_machine_10_0_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index f94713e6e29a..665b6201214c 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -779,6 +779,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_10_1[];
> +extern const size_t hw_compat_10_1_len;
> +
> extern GlobalProperty hw_compat_10_0[];
> extern const size_t hw_compat_10_0_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 79b72c54dd3f..e83157ab358f 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -214,6 +214,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr,
> size_t flash_size);
> /* sgx.c */
> void pc_machine_init_sgx_epc(PCMachineState *pcms);
>
> +extern GlobalProperty pc_compat_10_1[];
> +extern const size_t pc_compat_10_1_len;
> +
> extern GlobalProperty pc_compat_10_0[];
> extern const size_t pc_compat_10_0_len;
>
> --
> 2.50.1
