Re: [Qemu-devel] [PATCH v7 15/28] compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros

[Igor Mammedov]

On Fri, 21 Dec 2018 13:03:57 +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        | 24 ------------------------
>  include/hw/i386/pc.h       |  4 ++--
>  hw/core/machine.c          | 26 ++++++++++++++++++++++++++
>  hw/i386/pc.c               |  3 +++
>  hw/i386/pc_piix.c          |  6 ++----
>  hw/i386/pc_q35.c           |  6 ++----
>  hw/ppc/spapr.c             |  2 +-
>  hw/s390x/s390-virtio-ccw.c |  6 +-----
>  9 files changed, 40 insertions(+), 40 deletions(-)
> 
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index a9d413cdb7..36e1269eb1 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -314,4 +314,7 @@ extern const size_t hw_compat_2_7_len;
>  extern GlobalProperty hw_compat_2_6[];
>  extern const size_t hw_compat_2_6_len;
>  
> +extern GlobalProperty hw_compat_2_5[];
> +extern const size_t hw_compat_2_5_len;
> +
>  #endif
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index c744233fb6..a6eced34c6 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,30 +1,6 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>  
> -#define HW_COMPAT_2_5 \
> -    {\
> -        .driver   = "isa-fdc",\
> -        .property = "fallback",\
> -        .value    = "144",\
> -    },{\
> -        .driver   = "pvscsi",\
> -        .property = "x-old-pci-configuration",\
> -        .value    = "on",\
> -    },{\
> -        .driver   = "pvscsi",\
> -        .property = "x-disable-pcie",\
> -        .value    = "on",\
> -    },\
> -    {\
> -        .driver   = "vmxnet3",\
> -        .property = "x-old-msi-offsets",\
> -        .value    = "on",\
> -    },{\
> -        .driver   = "vmxnet3",\
> -        .property = "x-disable-pcie",\
> -        .value    = "on",\
> -    },
> -
>  #define HW_COMPAT_2_4 \
>      {\
>          .driver   = "virtio-blk-device",\
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index ca62def2c9..9a32031f25 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -321,8 +321,8 @@ extern const size_t pc_compat_2_7_len;
>  extern GlobalProperty pc_compat_2_6[];
>  extern const size_t pc_compat_2_6_len;
>  
> -#define PC_COMPAT_2_5 \
> -    HW_COMPAT_2_5
> +extern GlobalProperty pc_compat_2_5[];
> +extern const size_t pc_compat_2_5_len;
>  
>  /* Helper for setting model-id for CPU models that changed model-id
>   * depending on QEMU versions up to QEMU 2.4.
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 5f1af02c86..1022b538a5 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -200,6 +200,32 @@ GlobalProperty hw_compat_2_6[] = {
>  };
>  const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6);
>  
> +GlobalProperty hw_compat_2_5[] = {
> +    {
> +        .driver   = "isa-fdc",
> +        .property = "fallback",
> +        .value    = "144",
> +    },{
> +        .driver   = "pvscsi",
> +        .property = "x-old-pci-configuration",
> +        .value    = "on",
> +    },{
> +        .driver   = "pvscsi",
> +        .property = "x-disable-pcie",
> +        .value    = "on",
> +    },
> +    {
> +        .driver   = "vmxnet3",
> +        .property = "x-old-msi-offsets",
> +        .value    = "on",
> +    },{
> +        .driver   = "vmxnet3",
> +        .property = "x-disable-pcie",
> +        .value    = "on",
> +    },
> +};
> +const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5);
> +
>  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 f719115f17..ac54c2e39d 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -275,6 +275,9 @@ GlobalProperty pc_compat_2_6[] = {
>  };
>  const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6);
>  
> +GlobalProperty pc_compat_2_5[] = {};
> +const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5);
> +
>  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 5f3dc8a809..4f5168534a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -539,14 +539,12 @@ DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
>  static void pc_i440fx_2_5_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_5
> -    };
>  
>      pc_i440fx_2_6_machine_options(m);
>      pcmc->save_tsc_khz = false;
>      m->legacy_fw_cfg_order = 1;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len);
> +    compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len);
>  }
>  
>  DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 063df36cad..a33d5d3610 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -424,14 +424,12 @@ DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
>  static void pc_q35_2_5_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_5
> -    };
>  
>      pc_q35_2_6_machine_options(m);
>      pcmc->save_tsc_khz = false;
>      m->legacy_fw_cfg_order = 1;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len);
> +    compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len);
>  }
>  
>  DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 797f480564..c808ec90f0 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4226,7 +4226,6 @@ static void 
> spapr_machine_2_5_class_options(MachineClass *mc)
>  {
>      sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
>      static GlobalProperty compat[] = {
> -        HW_COMPAT_2_5
>          {
>              .driver   = "spapr-vlan",
>              .property = "use-rx-buffer-pools",
> @@ -4236,6 +4235,7 @@ static void 
> spapr_machine_2_5_class_options(MachineClass *mc)
>  
>      spapr_machine_2_6_class_options(mc);
>      smc->use_ohci_by_default = true;
> +    compat_props_add(mc->compat_props, hw_compat_2_5, hw_compat_2_5_len);
>      compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
>  }
>  
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 6137c97875..1ab53a1332 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -836,12 +836,8 @@ static void 
> ccw_machine_2_5_instance_options(MachineState *machine)
>  
>  static void ccw_machine_2_5_class_options(MachineClass *mc)
>  {
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_2_5
> -    };
> -
>      ccw_machine_2_6_class_options(mc);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_2_5, hw_compat_2_5_len);
>  }
>  DEFINE_CCW_MACHINE(2_5, "2.5", false);
>