Re: [qemu-s390x] [PATCH for-2.13] s390x: introduce 2.13 compat machine

[Christian Borntraeger]

On 03/29/2018 01:33 PM, Cornelia Huck wrote:
> Signed-off-by: Cornelia Huck <address@hidden>

Acked-by: Christian Borntraeger <address@hidden>

> ---
> Yes, it's that time again :)
> ---
>  hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
>  include/hw/compat.h        |  3 +++
>  2 files changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 864145a7c6..122f316f6a 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -668,6 +668,9 @@ bool css_migration_enabled(void)
>      }                                                                        
>  \
>      type_init(ccw_machine_register_##suffix)
> 
> +#define CCW_COMPAT_2_12 \
> +        HW_COMPAT_2_12
> +
>  #define CCW_COMPAT_2_11 \
>          HW_COMPAT_2_11 \
>          {\
> @@ -753,14 +756,26 @@ bool css_migration_enabled(void)
>              .value    = "0",\
>          },
> 
> +static void ccw_machine_2_13_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_13_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_13, "2.13", true);
> +
>  static void ccw_machine_2_12_instance_options(MachineState *machine)
>  {
> +    ccw_machine_2_13_instance_options(machine);
>  }
> 
>  static void ccw_machine_2_12_class_options(MachineClass *mc)
>  {
> +    ccw_machine_2_13_class_options(mc);
> +    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_12);
>  }
> -DEFINE_CCW_MACHINE(2_12, "2.12", true);
> +DEFINE_CCW_MACHINE(2_12, "2.12", false);
> 
>  static void ccw_machine_2_11_instance_options(MachineState *machine)
>  {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index bc9e3a6627..6e91491b77 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
> 
> +#define HW_COMPAT_2_12 \
> +    /* empty */
> +
>  #define HW_COMPAT_2_11 \
>      {\
>          .driver   = "hpet",\
>