Re: [PATCH for-9.1 v5 1/3] hw: Add compat machines for 9.1

From: Thomas Huth <thuth@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	Xiaoyao Li <xiaoyao.li@intel.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Harsh Prateek Bora <harshpb@linux.ibm.com>,
	Gavin Shan <gshan@redhat.com>
Subject: Re: [PATCH for-9.1 v5 1/3] hw: Add compat machines for 9.1
Date: Mon, 25 Mar 2024 16:07:39 +0100	[thread overview]
Message-ID: <aa14d73f-7374-4df8-a31a-8909801ef2f8@redhat.com> (raw)
In-Reply-To: <20240325141422.1380087-2-pbonzini@redhat.com>

On 25/03/2024 15.14, Paolo Bonzini wrote:
> Add 9.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
> 
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Cc: Gavin Shan <gshan@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   include/hw/boards.h        |  3 +++
>   include/hw/i386/pc.h       |  3 +++
>   hw/arm/virt.c              | 11 +++++++++--
>   hw/core/machine.c          |  3 +++
>   hw/i386/pc.c               |  3 +++
>   hw/i386/pc_piix.c          | 17 ++++++++++++++---
>   hw/i386/pc_q35.c           | 14 ++++++++++++--
>   hw/m68k/virt.c             | 11 +++++++++--
>   hw/ppc/spapr.c             | 17 ++++++++++++++---
>   hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
>   10 files changed, 83 insertions(+), 13 deletions(-)
....
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index b1dcb3857f0..67e8b0b05e8 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -859,14 +859,26 @@ bool css_migration_enabled(void)
>       }                                                                         \
>       type_init(ccw_machine_register_##suffix)
>   
> +static void ccw_machine_9_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_9_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(9_0, "9.1", true);
> +
>   static void ccw_machine_9_0_instance_options(MachineState *machine)
>   {
> +    ccw_machine_9_1_instance_options(machine);
>   }
>   
>   static void ccw_machine_9_0_class_options(MachineClass *mc)
>   {
> +    ccw_machine_9_1_class_options(machine);
> +    compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
>   }
> -DEFINE_CCW_MACHINE(9_0, "9.0", true);
> +DEFINE_CCW_MACHINE(9_0, "9.0", false);
>   
>   static void ccw_machine_8_2_instance_options(MachineState *machine)
>   {

For s390x:
Acked-by: Thomas Huth <thuth@redhat.com>