Re: [Qemu-devel] [PATCH v7 09/28] compat: replace PC_COMPAT_2_11 & HW_COMPAT_2_11 macros

[Igor Mammedov]

On Fri, 21 Dec 2018 13:03:51 +0400
Marc-André Lureau <address@hidden> wrote:

> Use static arrays instead.
> 
> Suggested-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Marc-André Lureau <address@hidden>

Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  include/hw/boards.h        |  3 +++
>  include/hw/compat.h        | 19 -------------------
>  include/hw/i386/pc.h       | 13 ++-----------
>  hw/arm/virt.c              |  5 +----
>  hw/core/machine.c          | 21 +++++++++++++++++++++
>  hw/i386/pc.c               | 13 +++++++++++++
>  hw/i386/pc_piix.c          |  7 ++-----
>  hw/i386/pc_q35.c           |  7 ++-----
>  hw/ppc/spapr.c             |  5 +----
>  hw/s390x/s390-virtio-ccw.c |  2 +-
>  10 files changed, 46 insertions(+), 49 deletions(-)
> 
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index b06444ffed..59c3c4b75e 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -296,4 +296,7 @@ extern const size_t hw_compat_3_0_len;
>  extern GlobalProperty hw_compat_2_12[];
>  extern const size_t hw_compat_2_12_len;
>  
> +extern GlobalProperty hw_compat_2_11[];
> +extern const size_t hw_compat_2_11_len;
> +
>  #endif
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 13242b831a..cf389b4e85 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,25 +1,6 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>  
> -#define HW_COMPAT_2_11 \
> -    {\
> -        .driver   = "hpet",\
> -        .property = "hpet-offset-saved",\
> -        .value    = "false",\
> -    },{\
> -        .driver   = "virtio-blk-pci",\
> -        .property = "vectors",\
> -        .value    = "2",\
> -    },{\
> -        .driver   = "vhost-user-blk-pci",\
> -        .property = "vectors",\
> -        .value    = "2",\
> -    },{\
> -        .driver   = "e1000",\
> -        .property = "migrate_tso_props",\
> -        .value    = "off",\
> -    },
> -
>  #define HW_COMPAT_2_10 \
>      {\
>          .driver   = "virtio-mouse-device",\
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 91cb3283f0..f0f7e76a3e 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -303,17 +303,8 @@ extern const size_t pc_compat_3_0_len;
>  extern GlobalProperty pc_compat_2_12[];
>  extern const size_t pc_compat_2_12_len;
>  
> -#define PC_COMPAT_2_11 \
> -    HW_COMPAT_2_11 \
> -    {\
> -        .driver   = TYPE_X86_CPU,\
> -        .property = "x-migrate-smi-count",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "Skylake-Server" "-" TYPE_X86_CPU,\
> -        .property = "clflushopt",\
> -        .value    = "off",\
> -    },
> +extern GlobalProperty pc_compat_2_11[];
> +extern const size_t pc_compat_2_11_len;
>  
>  #define PC_COMPAT_2_10 \
>      HW_COMPAT_2_10 \
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 1b39d9845b..b7aabd4ac7 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1900,12 +1900,9 @@ DEFINE_VIRT_MACHINE(2, 12)
>  static void virt_machine_2_11_options(MachineClass *mc)
>  {
>      VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_2_11
> -    };
>  
>      virt_machine_2_12_options(mc);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
>      vmc->smbios_old_sys_ver = true;
>  }
>  DEFINE_VIRT_MACHINE(2, 11)
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 447fe1db6b..e8f715542a 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -57,6 +57,27 @@ GlobalProperty hw_compat_2_12[] = {
>  };
>  const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12);
>  
> +GlobalProperty hw_compat_2_11[] = {
> +    {
> +        .driver   = "hpet",
> +        .property = "hpet-offset-saved",
> +        .value    = "false",
> +    },{
> +        .driver   = "virtio-blk-pci",
> +        .property = "vectors",
> +        .value    = "2",
> +    },{
> +        .driver   = "vhost-user-blk-pci",
> +        .property = "vectors",
> +        .value    = "2",
> +    },{
> +        .driver   = "e1000",
> +        .property = "migrate_tso_props",
> +        .value    = "off",
> +    },
> +};
> +const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11);
> +
>  static char *machine_get_accel(Object *obj, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 84fe7e49af..e42a1eae51 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -150,6 +150,19 @@ GlobalProperty pc_compat_2_12[] = {
>  };
>  const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
>  
> +GlobalProperty pc_compat_2_11[] = {
> +    {
> +        .driver   = TYPE_X86_CPU,
> +        .property = "x-migrate-smi-count",
> +        .value    = "off",
> +    },{
> +        .driver   = "Skylake-Server" "-" TYPE_X86_CPU,
> +        .property = "clflushopt",
> +        .value    = "off",
> +    },
> +};
> +const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
> +
>  void gsi_handler(void *opaque, int n, int level)
>  {
>      GSIState *s = opaque;
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 16dda48c56..32daebc05e 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -472,12 +472,9 @@ DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,
>  
>  static void pc_i440fx_2_11_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_11
> -    };
> -
>      pc_i440fx_2_12_machine_options(m);
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
> +    compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
>  }
>  
>  DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 86f08441d6..bc195b8c58 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -354,14 +354,11 @@ DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,
>  static void pc_q35_2_11_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_11
> -    };
> -
>  
>      pc_q35_2_12_machine_options(m);
>      pcmc->default_nic_model = "e1000";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
> +    compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
>  }
>  
>  DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 63453f688f..88e2c8df71 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4040,13 +4040,10 @@ DEFINE_SPAPR_MACHINE(2_12_sxxm, "2.12-sxxm", false);
>  static void spapr_machine_2_11_class_options(MachineClass *mc)
>  {
>      sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_2_11
> -    };
>  
>      spapr_machine_2_12_class_options(mc);
>      smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON;
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
>  }
>  
>  DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index ce22a9d511..74623becaf 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -713,7 +713,6 @@ static void 
> ccw_machine_2_11_instance_options(MachineState *machine)
>  static void ccw_machine_2_11_class_options(MachineClass *mc)
>  {
>      static GlobalProperty compat[] = {
> -        HW_COMPAT_2_11
>          {
>              .driver   = TYPE_SCLP_EVENT_FACILITY,
>              .property = "allow_all_mask_sizes",
> @@ -722,6 +721,7 @@ static void ccw_machine_2_11_class_options(MachineClass 
> *mc)
>      };
>  
>      ccw_machine_2_12_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
>      compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
>  }
>  DEFINE_CCW_MACHINE(2_11, "2.11", false);