Re: [Qemu-devel] [PATCH v7 12/28] compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros

[Igor Mammedov]

On Fri, 21 Dec 2018 13:03:54 +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        | 43 -----------------------------------
>  include/hw/i386/pc.h       | 29 ++----------------------
>  hw/arm/virt.c              |  5 +----
>  hw/core/machine.c          | 46 ++++++++++++++++++++++++++++++++++++++
>  hw/i386/pc.c               | 29 ++++++++++++++++++++++++
>  hw/i386/pc_piix.c          |  7 ++----
>  hw/i386/pc_q35.c           |  7 ++----
>  hw/ppc/spapr.c             |  2 +-
>  hw/s390x/s390-virtio-ccw.c |  2 +-
>  10 files changed, 87 insertions(+), 86 deletions(-)
> 
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 226d6cfaa7..f8aa034d0e 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -305,4 +305,7 @@ extern const size_t hw_compat_2_10_len;
>  extern GlobalProperty hw_compat_2_9[];
>  extern const size_t hw_compat_2_9_len;
>  
> +extern GlobalProperty hw_compat_2_8[];
> +extern const size_t hw_compat_2_8_len;
> +
>  #endif
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index ef154ca470..65d6748054 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,49 +1,6 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>  
> -#define HW_COMPAT_2_8 \
> -    {\
> -        .driver   = "fw_cfg_mem",\
> -        .property = "x-file-slots",\
> -        .value    = stringify(0x10),\
> -    },{\
> -        .driver   = "fw_cfg_io",\
> -        .property = "x-file-slots",\
> -        .value    = stringify(0x10),\
> -    },{\
> -        .driver   = "pflash_cfi01",\
> -        .property = "old-multiple-chip-handling",\
> -        .value    = "on",\
> -    },{\
> -        .driver   = "pci-bridge",\
> -        .property = "shpc",\
> -        .value    = "on",\
> -    },{\
> -        .driver   = TYPE_PCI_DEVICE,\
> -        .property = "x-pcie-extcap-init",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "virtio-pci",\
> -        .property = "x-pcie-deverr-init",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "virtio-pci",\
> -        .property = "x-pcie-lnkctl-init",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "virtio-pci",\
> -        .property = "x-pcie-pm-init",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "cirrus-vga",\
> -        .property = "vgamem_mb",\
> -        .value    = "8",\
> -    },{\
> -        .driver   = "isa-cirrus-vga",\
> -        .property = "vgamem_mb",\
> -        .value    = "8",\
> -    },
> -
>  #define HW_COMPAT_2_7 \
>      {\
>          .driver   = "virtio-pci",\
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index fb79f0b988..12c47d2506 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -312,33 +312,8 @@ extern const size_t pc_compat_2_10_len;
>  extern GlobalProperty pc_compat_2_9[];
>  extern const size_t pc_compat_2_9_len;
>  
> -#define PC_COMPAT_2_8 \
> -    HW_COMPAT_2_8 \
> -    {\
> -        .driver   = TYPE_X86_CPU,\
> -        .property = "tcg-cpuid",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "kvmclock",\
> -        .property = "x-mach-use-reliable-get-clock",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "ICH9-LPC",\
> -        .property = "x-smi-broadcast",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = TYPE_X86_CPU,\
> -        .property = "vmware-cpuid-freq",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "Haswell-" TYPE_X86_CPU,\
> -        .property = "stepping",\
> -        .value    = "1",\
> -    },
> +extern GlobalProperty pc_compat_2_8[];
> +extern const size_t pc_compat_2_8_len;
>  
>  #define PC_COMPAT_2_7 \
>      HW_COMPAT_2_7 \
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 2db46567bb..850a02cf43 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1926,12 +1926,9 @@ DEFINE_VIRT_MACHINE(2, 9)
>  static void virt_machine_2_8_options(MachineClass *mc)
>  {
>      VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
> -    static GlobalProperty compat[] = {
> -        HW_COMPAT_2_8
> -    };
>  
>      virt_machine_2_9_options(mc);
> -    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
>      /* For 2.8 and earlier we falsely claimed in the DT that
>       * our timers were edge-triggered, not level-triggered.
>       */
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 2d7e774a5d..b3ea5bd777 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -21,6 +21,7 @@
>  #include "sysemu/numa.h"
>  #include "qemu/error-report.h"
>  #include "sysemu/qtest.h"
> +#include "hw/pci/pci.h"
>  
>  GlobalProperty hw_compat_3_1[] = {};
>  const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1);
> @@ -112,6 +113,51 @@ GlobalProperty hw_compat_2_9[] = {
>  };
>  const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9);
>  
> +GlobalProperty hw_compat_2_8[] = {
> +    {
> +        .driver   = "fw_cfg_mem",
> +        .property = "x-file-slots",
> +        .value    = stringify(0x10),
> +    },{
> +        .driver   = "fw_cfg_io",
> +        .property = "x-file-slots",
> +        .value    = stringify(0x10),
> +    },{
> +        .driver   = "pflash_cfi01",
> +        .property = "old-multiple-chip-handling",
> +        .value    = "on",
> +    },{
> +        .driver   = "pci-bridge",
> +        .property = "shpc",
> +        .value    = "on",
> +    },{
> +        .driver   = TYPE_PCI_DEVICE,
> +        .property = "x-pcie-extcap-init",
> +        .value    = "off",
> +    },{
> +        .driver   = "virtio-pci",
> +        .property = "x-pcie-deverr-init",
> +        .value    = "off",
> +    },{
> +        .driver   = "virtio-pci",
> +        .property = "x-pcie-lnkctl-init",
> +        .value    = "off",
> +    },{
> +        .driver   = "virtio-pci",
> +        .property = "x-pcie-pm-init",
> +        .value    = "off",
> +    },{
> +        .driver   = "cirrus-vga",
> +        .property = "vgamem_mb",
> +        .value    = "8",
> +    },{
> +        .driver   = "isa-cirrus-vga",
> +        .property = "vgamem_mb",
> +        .value    = "8",
> +    },
> +};
> +const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8);
> +
>  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 f36cc5f79c..517ead567c 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -189,6 +189,35 @@ GlobalProperty pc_compat_2_9[] = {
>  };
>  const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9);
>  
> +GlobalProperty pc_compat_2_8[] = {
> +    {
> +        .driver   = TYPE_X86_CPU,
> +        .property = "tcg-cpuid",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "kvmclock",
> +        .property = "x-mach-use-reliable-get-clock",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "ICH9-LPC",
> +        .property = "x-smi-broadcast",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = TYPE_X86_CPU,
> +        .property = "vmware-cpuid-freq",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "Haswell-" TYPE_X86_CPU,
> +        .property = "stepping",
> +        .value    = "1",
> +    },
> +};
> +const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8);
> +
>  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 5bc3ad0331..deb5500624 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -504,12 +504,9 @@ DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
>  
>  static void pc_i440fx_2_8_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_8
> -    };
> -
>      pc_i440fx_2_9_machine_options(m);
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len);
> +    compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len);
>  }
>  
>  DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 4e57830a6d..57b46e1ecb 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -388,12 +388,9 @@ DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
>  
>  static void pc_q35_2_8_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_8
> -    };
> -
>      pc_q35_2_9_machine_options(m);
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len);
> +    compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len);
>  }
>  
>  DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 7aa3a09ed4..d2e46362fb 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4092,7 +4092,6 @@ DEFINE_SPAPR_MACHINE(2_9, "2.9", false);
>  static void spapr_machine_2_8_class_options(MachineClass *mc)
>  {
>      static GlobalProperty compat[] = {
> -        HW_COMPAT_2_8
>          {
>              .driver   = TYPE_SPAPR_PCI_HOST_BRIDGE,
>              .property = "pcie-extended-configuration-space",
> @@ -4101,6 +4100,7 @@ static void 
> spapr_machine_2_8_class_options(MachineClass *mc)
>      };
>  
>      spapr_machine_2_9_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
>      compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
>      mc->numa_mem_align_shift = 23;
>  }
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 549f6e0231..22e96ab353 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -774,7 +774,6 @@ static void ccw_machine_2_8_instance_options(MachineState 
> *machine)
>  static void ccw_machine_2_8_class_options(MachineClass *mc)
>  {
>      static GlobalProperty compat[] = {
> -        HW_COMPAT_2_8
>          {
>              .driver   = TYPE_S390_FLIC_COMMON,
>              .property = "adapter_routes_max_batch",
> @@ -783,6 +782,7 @@ static void ccw_machine_2_8_class_options(MachineClass 
> *mc)
>      };
>  
>      ccw_machine_2_9_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
>      compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
>  }
>  DEFINE_CCW_MACHINE(2_8, "2.8", false);