Re: [qemu-s390x] [PATCH 3/3] machine: Use shorter format for GlobalProperty arrays

[Cornelia Huck]

On Mon,  7 Jan 2019 17:30:20 -0200
Eduardo Habkost <address@hidden> wrote:

> Instead of verbose arrays with 4 lines for each entry, make each
> entry take only one line.  This makes long arrays that couldn't
> fit in the screen become short and readable.
> 
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
>  include/hw/i386/pc.h       |  18 +-
>  hw/core/machine.c          | 338 ++++-------------
>  hw/i386/pc.c               | 720 +++++++------------------------------
>  hw/i386/pc_piix.c          | 192 ++--------
>  hw/ppc/spapr.c             |  72 +---
>  hw/s390x/s390-virtio-ccw.c |  75 +---
>  hw/xen/xen-common.c        |  18 +-
>  7 files changed, 265 insertions(+), 1168 deletions(-)
> 

(...)

> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index c737507053..811fdf913d 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c

(...)

> @@ -810,15 +798,8 @@ static void ccw_machine_2_6_class_options(MachineClass 
> *mc)
>  {
>      S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
>      static GlobalProperty compat[] = {
> -        {
> -            .driver   = TYPE_S390_IPL,
> -            .property = "iplbext_migration",
> -            .value    = "off",
> -        }, {
> -            .driver   = TYPE_VIRTUAL_CSS_BRIDGE,
> -            .property = "css_dev_path",
> -            .value    = "off",
> -        },
> +        { TYPE_S390_IPL, "iplbext_migration", "off", },
> +         { TYPE_VIRTUAL_CSS_BRIDGE, "css_dev_path", "off", },

The indentation looks off here.

>      };
>  
>      s390mc->ri_allowed = false;

(...)

With or without alignment:

Reviewed-by: Cornelia Huck <address@hidden>