Re: [Qemu-devel] [PATCH v7 06/28] compat: replace PC_COMPAT_3_1 & HW_COMPAT_3_1 macros

[Igor Mammedov]

On Fri, 21 Dec 2018 13:03:48 +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        | 3 ---
>  include/hw/i386/pc.h       | 4 ++--
>  hw/arm/virt.c              | 6 +-----
>  hw/core/machine.c          | 3 +++
>  hw/i386/pc.c               | 3 +++
>  hw/i386/pc_piix.c          | 7 ++-----
>  hw/i386/pc_q35.c           | 7 ++-----
>  hw/ppc/spapr.c             | 6 +-----
>  hw/s390x/s390-virtio-ccw.c | 6 +-----
>  10 files changed, 18 insertions(+), 30 deletions(-)
> 
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index f743d9d4a4..dc8c748c62 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -287,4 +287,7 @@ struct MachineState {
>      } \
>      type_init(machine_initfn##_register_types)
>  
> +extern GlobalProperty hw_compat_3_1[];
> +extern const size_t hw_compat_3_1_len;
> +
>  #endif
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 70958328fe..6f4d5fc647 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,9 +1,6 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>  
> -#define HW_COMPAT_3_1 \
> -    /* empty */
> -
>  #define HW_COMPAT_3_0 \
>      /* empty */
>  
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 9d29c4b1df..dd1d6fd0f3 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -294,8 +294,8 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  int e820_get_num_entries(void);
>  bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
>  
> -#define PC_COMPAT_3_1 \
> -    HW_COMPAT_3_1 \
> +extern GlobalProperty pc_compat_3_1[];
> +extern const size_t pc_compat_3_1_len;
>  
>  #define PC_COMPAT_3_0 \
>      HW_COMPAT_3_0 \
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index caa61c6201..b1ecccfaab 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1874,12 +1874,8 @@ DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
>  
>  static void virt_machine_3_1_options(MachineClass *mc)
>  {
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_3_1
> -    };
> -
>      virt_machine_4_0_options(mc);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len);
>  }
>  DEFINE_VIRT_MACHINE(3, 1)
>  
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 6e24924aba..bdeeda68e4 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -22,6 +22,9 @@
>  #include "qemu/error-report.h"
>  #include "sysemu/qtest.h"
>  
> +GlobalProperty hw_compat_3_1[] = {};
> +const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1);
> +
>  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 115bc2825c..74d8a82f64 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -109,6 +109,9 @@ static struct e820_entry *e820_table;
>  static unsigned e820_entries;
>  struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
>  
> +GlobalProperty pc_compat_3_1[] = {};
> +const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
> +
>  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 d1abe637f1..5342019d83 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -440,14 +440,11 @@ DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
>  
>  static void pc_i440fx_3_1_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_3_1
> -    };
> -
>      pc_i440fx_4_0_machine_options(m);
>      m->is_default = 0;
>      m->alias = NULL;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
> +    compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
>  }
>  
>  DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index c18bfd68c6..1eb1e82b25 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -322,13 +322,10 @@ DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
>  
>  static void pc_q35_3_1_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_3_1
> -    };
> -
>      pc_q35_4_0_machine_options(m);
>      m->alias = NULL;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
> +    compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
>  }
>  
>  DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 2313362ff2..038d1859a6 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3965,12 +3965,8 @@ DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
>   */
>  static void spapr_machine_3_1_class_options(MachineClass *mc)
>  {
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_3_1
> -    };
> -
>      spapr_machine_4_0_class_options(mc);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len);
>  }
>  
>  DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 21f3325c5a..5e8b48e75b 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -667,12 +667,8 @@ static void 
> ccw_machine_3_1_instance_options(MachineState *machine)
>  
>  static void ccw_machine_3_1_class_options(MachineClass *mc)
>  {
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_3_1
> -    };
> -
>      ccw_machine_4_0_class_options(mc);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len);
>  }
>  DEFINE_CCW_MACHINE(3_1, "3.1", false);
>