qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: qemu-devel@nongnu.org, ehabkost@redhat.com
Subject: Re: [Qemu-devel] [PATCH v7 21/28] compat: remove remaining PC_COMPAT macros
Date: Thu, 27 Dec 2018 07:58:35 +0100	[thread overview]
Message-ID: <20181227075835.4670c6e3@Igors-MacBook-Pro.local> (raw)
In-Reply-To: <20181221090410.27250-22-marcandre.lureau@redhat.com>

On Fri, 21 Dec 2018 13:04:03 +0400
Marc-André Lureau <marcandre.lureau@redhat.com> wrote:

> Use static arrays instead.  I decided to rename the conflicting
> pc_compat_2_1() function with pc_compat_2_1_fn().
> 
> Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  include/hw/i386/pc.h | 236 +++----------------------------------------
>  hw/i386/pc.c         | 232 ++++++++++++++++++++++++++++++++++++++++++
>  hw/i386/pc_piix.c    |  57 ++++-------
>  3 files changed, 267 insertions(+), 258 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 6b7bf334cd..84720bede9 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -335,6 +335,21 @@ extern const size_t pc_compat_2_2_len;
>  extern GlobalProperty pc_compat_2_1[];
>  extern const size_t pc_compat_2_1_len;
>  
> +extern GlobalProperty pc_compat_2_0[];
> +extern const size_t pc_compat_2_0_len;
> +
> +extern GlobalProperty pc_compat_1_7[];
> +extern const size_t pc_compat_1_7_len;
> +
> +extern GlobalProperty pc_compat_1_6[];
> +extern const size_t pc_compat_1_6_len;
> +
> +extern GlobalProperty pc_compat_1_5[];
> +extern const size_t pc_compat_1_5_len;
> +
> +extern GlobalProperty pc_compat_1_4[];
> +extern const size_t pc_compat_1_4_len;
> +
>  /* Helper for setting model-id for CPU models that changed model-id
>   * depending on QEMU versions up to QEMU 2.4.
>   */
> @@ -355,227 +370,6 @@ extern const size_t pc_compat_2_1_len;
>          .value    = "QEMU Virtual CPU version " v,\
>      },
>  
> -#define PC_COMPAT_2_0 \
> -    PC_CPU_MODEL_IDS("2.0.0") \
> -    {\
> -        .driver   = "virtio-scsi-pci",\
> -        .property = "any_layout",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "PIIX4_PM",\
> -        .property = "memory-hotplug-support",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "apic",\
> -        .property = "version",\
> -        .value    = stringify(0x11),\
> -    },\
> -    {\
> -        .driver   = "nec-usb-xhci",\
> -        .property = "superspeed-ports-first",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "nec-usb-xhci",\
> -        .property = "force-pcie-endcap",\
> -        .value    = "on",\
> -    },\
> -    {\
> -        .driver   = "pci-serial",\
> -        .property = "prog_if",\
> -        .value    = stringify(0),\
> -    },\
> -    {\
> -        .driver   = "pci-serial-2x",\
> -        .property = "prog_if",\
> -        .value    = stringify(0),\
> -    },\
> -    {\
> -        .driver   = "pci-serial-4x",\
> -        .property = "prog_if",\
> -        .value    = stringify(0),\
> -    },\
> -    {\
> -        .driver   = "virtio-net-pci",\
> -        .property = "guest_announce",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "ICH9-LPC",\
> -        .property = "memory-hotplug-support",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "xio3130-downstream",\
> -        .property = COMPAT_PROP_PCP,\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "ioh3420",\
> -        .property = COMPAT_PROP_PCP,\
> -        .value    = "off",\
> -    },
> -
> -#define PC_COMPAT_1_7 \
> -    PC_CPU_MODEL_IDS("1.7.0") \
> -    {\
> -        .driver   = TYPE_USB_DEVICE,\
> -        .property = "msos-desc",\
> -        .value    = "no",\
> -    },\
> -    {\
> -        .driver   = "PIIX4_PM",\
> -        .property = "acpi-pci-hotplug-with-bridge-support",\
> -        .value    = "off",\
> -    },\
> -    {\
> -        .driver   = "hpet",\
> -        .property = HPET_INTCAP,\
> -        .value    = stringify(4),\
> -    },
> -
> -#define PC_COMPAT_1_6 \
> -    PC_CPU_MODEL_IDS("1.6.0") \
> -    {\
> -        .driver   = "e1000",\
> -        .property = "mitigation",\
> -        .value    = "off",\
> -    },{\
> -        .driver   = "qemu64-" TYPE_X86_CPU,\
> -        .property = "model",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "qemu32-" TYPE_X86_CPU,\
> -        .property = "model",\
> -        .value    = stringify(3),\
> -    },{\
> -        .driver   = "i440FX-pcihost",\
> -        .property = "short_root_bus",\
> -        .value    = stringify(1),\
> -    },{\
> -        .driver   = "q35-pcihost",\
> -        .property = "short_root_bus",\
> -        .value    = stringify(1),\
> -    },
> -
> -#define PC_COMPAT_1_5 \
> -    PC_CPU_MODEL_IDS("1.5.0") \
> -    {\
> -        .driver   = "Conroe-" TYPE_X86_CPU,\
> -        .property = "model",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "Conroe-" TYPE_X86_CPU,\
> -        .property = "min-level",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "Penryn-" TYPE_X86_CPU,\
> -        .property = "model",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "Penryn-" TYPE_X86_CPU,\
> -        .property = "min-level",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "Nehalem-" TYPE_X86_CPU,\
> -        .property = "model",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "Nehalem-" TYPE_X86_CPU,\
> -        .property = "min-level",\
> -        .value    = stringify(2),\
> -    },{\
> -        .driver   = "virtio-net-pci",\
> -        .property = "any_layout",\
> -        .value    = "off",\
> -    },{\
> -        .driver = TYPE_X86_CPU,\
> -        .property = "pmu",\
> -        .value = "on",\
> -    },{\
> -        .driver   = "i440FX-pcihost",\
> -        .property = "short_root_bus",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "q35-pcihost",\
> -        .property = "short_root_bus",\
> -        .value    = stringify(0),\
> -    },
> -
> -#define PC_COMPAT_1_4 \
> -    PC_CPU_MODEL_IDS("1.4.0") \
> -    {\
> -        .driver   = "scsi-hd",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "scsi-cd",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "scsi-disk",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "ide-hd",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "ide-cd",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "ide-drive",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "virtio-blk-pci",\
> -        .property = "discard_granularity",\
> -        .value    = stringify(0),\
> -    },{\
> -        .driver   = "virtio-serial-pci",\
> -        .property = "vectors",\
> -        /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */\
> -        .value    = stringify(0xFFFFFFFF),\
> -    },{ \
> -        .driver   = "virtio-net-pci", \
> -        .property = "ctrl_guest_offloads", \
> -        .value    = "off", \
> -    },{\
> -        .driver   = "e1000",\
> -        .property = "romfile",\
> -        .value    = "pxe-e1000.rom",\
> -    },{\
> -        .driver   = "ne2k_pci",\
> -        .property = "romfile",\
> -        .value    = "pxe-ne2k_pci.rom",\
> -    },{\
> -        .driver   = "pcnet",\
> -        .property = "romfile",\
> -        .value    = "pxe-pcnet.rom",\
> -    },{\
> -        .driver   = "rtl8139",\
> -        .property = "romfile",\
> -        .value    = "pxe-rtl8139.rom",\
> -    },{\
> -        .driver   = "virtio-net-pci",\
> -        .property = "romfile",\
> -        .value    = "pxe-virtio.rom",\
> -    },{\
> -        .driver   = "486-" TYPE_X86_CPU,\
> -        .property = "model",\
> -        .value    = stringify(0),\
> -    },\
> -    {\
> -        .driver = "n270" "-" TYPE_X86_CPU,\
> -        .property = "movbe",\
> -        .value = "off",\
> -    },\
> -    {\
> -        .driver = "Westmere" "-" TYPE_X86_CPU,\
> -        .property = "pclmulqdq",\
> -        .value = "off",\
> -    },
> -
>  #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
>      static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
>      { \
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f0c8f54aaf..76c7f84c37 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -72,6 +72,7 @@
>  #include "qapi/visitor.h"
>  #include "qom/cpu.h"
>  #include "hw/nmi.h"
> +#include "hw/usb.h"
>  #include "hw/i386/intel_iommu.h"
>  #include "hw/net/ne2000-isa.h"
>  
> @@ -545,6 +546,237 @@ GlobalProperty pc_compat_2_1[] = {
>  };
>  const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1);
>  
> +GlobalProperty pc_compat_2_0[] = {
> +    PC_CPU_MODEL_IDS("2.0.0")
> +    {
> +        .driver   = "virtio-scsi-pci",
> +        .property = "any_layout",
> +        .value    = "off",
> +    },{
> +        .driver   = "PIIX4_PM",
> +        .property = "memory-hotplug-support",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "apic",
> +        .property = "version",
> +        .value    = stringify(0x11),
> +    },
> +    {
> +        .driver   = "nec-usb-xhci",
> +        .property = "superspeed-ports-first",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "nec-usb-xhci",
> +        .property = "force-pcie-endcap",
> +        .value    = "on",
> +    },
> +    {
> +        .driver   = "pci-serial",
> +        .property = "prog_if",
> +        .value    = stringify(0),
> +    },
> +    {
> +        .driver   = "pci-serial-2x",
> +        .property = "prog_if",
> +        .value    = stringify(0),
> +    },
> +    {
> +        .driver   = "pci-serial-4x",
> +        .property = "prog_if",
> +        .value    = stringify(0),
> +    },
> +    {
> +        .driver   = "virtio-net-pci",
> +        .property = "guest_announce",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "ICH9-LPC",
> +        .property = "memory-hotplug-support",
> +        .value    = "off",
> +    },{
> +        .driver   = "xio3130-downstream",
> +        .property = COMPAT_PROP_PCP,
> +        .value    = "off",
> +    },{
> +        .driver   = "ioh3420",
> +        .property = COMPAT_PROP_PCP,
> +        .value    = "off",
> +    },
> +};
> +const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0);
> +
> +GlobalProperty pc_compat_1_7[] = {
> +    PC_CPU_MODEL_IDS("1.7.0")
> +    {
> +        .driver   = TYPE_USB_DEVICE,
> +        .property = "msos-desc",
> +        .value    = "no",
> +    },
> +    {
> +        .driver   = "PIIX4_PM",
> +        .property = "acpi-pci-hotplug-with-bridge-support",
> +        .value    = "off",
> +    },
> +    {
> +        .driver   = "hpet",
> +        .property = HPET_INTCAP,
> +        .value    = stringify(4),
> +    },
> +};
> +const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7);
> +
> +GlobalProperty pc_compat_1_6[] = {
> +    PC_CPU_MODEL_IDS("1.6.0")
> +    {
> +        .driver   = "e1000",
> +        .property = "mitigation",
> +        .value    = "off",
> +    },{
> +        .driver   = "qemu64-" TYPE_X86_CPU,
> +        .property = "model",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "qemu32-" TYPE_X86_CPU,
> +        .property = "model",
> +        .value    = stringify(3),
> +    },{
> +        .driver   = "i440FX-pcihost",
> +        .property = "short_root_bus",
> +        .value    = stringify(1),
> +    },{
> +        .driver   = "q35-pcihost",
> +        .property = "short_root_bus",
> +        .value    = stringify(1),
> +    },
> +};
> +const size_t pc_compat_1_6_len = G_N_ELEMENTS(pc_compat_1_6);
> +
> +GlobalProperty pc_compat_1_5[] = {
> +    PC_CPU_MODEL_IDS("1.5.0")
> +    {
> +        .driver   = "Conroe-" TYPE_X86_CPU,
> +        .property = "model",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "Conroe-" TYPE_X86_CPU,
> +        .property = "min-level",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "Penryn-" TYPE_X86_CPU,
> +        .property = "model",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "Penryn-" TYPE_X86_CPU,
> +        .property = "min-level",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "Nehalem-" TYPE_X86_CPU,
> +        .property = "model",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "Nehalem-" TYPE_X86_CPU,
> +        .property = "min-level",
> +        .value    = stringify(2),
> +    },{
> +        .driver   = "virtio-net-pci",
> +        .property = "any_layout",
> +        .value    = "off",
> +    },{
> +        .driver = TYPE_X86_CPU,
> +        .property = "pmu",
> +        .value = "on",
> +    },{
> +        .driver   = "i440FX-pcihost",
> +        .property = "short_root_bus",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "q35-pcihost",
> +        .property = "short_root_bus",
> +        .value    = stringify(0),
> +    },
> +};
> +const size_t pc_compat_1_5_len = G_N_ELEMENTS(pc_compat_1_5);
> +
> +GlobalProperty pc_compat_1_4[] = {
> +    PC_CPU_MODEL_IDS("1.4.0")
> +    {
> +        .driver   = "scsi-hd",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "scsi-cd",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "scsi-disk",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "ide-hd",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "ide-cd",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "ide-drive",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "virtio-blk-pci",
> +        .property = "discard_granularity",
> +        .value    = stringify(0),
> +    },{
> +        .driver   = "virtio-serial-pci",
> +        .property = "vectors",
> +        /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */
> +        .value    = stringify(0xFFFFFFFF),
> +    },{
> +        .driver   = "virtio-net-pci",
> +        .property = "ctrl_guest_offloads",
> +        .value    = "off",
> +    },{
> +        .driver   = "e1000",
> +        .property = "romfile",
> +        .value    = "pxe-e1000.rom",
> +    },{
> +        .driver   = "ne2k_pci",
> +        .property = "romfile",
> +        .value    = "pxe-ne2k_pci.rom",
> +    },{
> +        .driver   = "pcnet",
> +        .property = "romfile",
> +        .value    = "pxe-pcnet.rom",
> +    },{
> +        .driver   = "rtl8139",
> +        .property = "romfile",
> +        .value    = "pxe-rtl8139.rom",
> +    },{
> +        .driver   = "virtio-net-pci",
> +        .property = "romfile",
> +        .value    = "pxe-virtio.rom",
> +    },{
> +        .driver   = "486-" TYPE_X86_CPU,
> +        .property = "model",
> +        .value    = stringify(0),
> +    },
> +    {
> +        .driver = "n270" "-" TYPE_X86_CPU,
> +        .property = "movbe",
> +        .value = "off",
> +    },
> +    {
> +        .driver = "Westmere" "-" TYPE_X86_CPU,
> +        .property = "pclmulqdq",
> +        .value = "off",
> +    },
> +};
> +const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
> +
>  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 c7b5e0a3ad..1c77119877 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -329,35 +329,35 @@ static void pc_compat_2_1_fn(MachineState *machine)
>      x86_cpu_change_kvm_default("svm", NULL);
>  }
>  
> -static void pc_compat_2_0(MachineState *machine)
> +static void pc_compat_2_0_fn(MachineState *machine)
>  {
>      pc_compat_2_1_fn(machine);
>  }
>  
> -static void pc_compat_1_7(MachineState *machine)
> +static void pc_compat_1_7_fn(MachineState *machine)
>  {
> -    pc_compat_2_0(machine);
> +    pc_compat_2_0_fn(machine);
>      x86_cpu_change_kvm_default("x2apic", NULL);
>  }
>  
> -static void pc_compat_1_6(MachineState *machine)
> +static void pc_compat_1_6_fn(MachineState *machine)
>  {
> -    pc_compat_1_7(machine);
> +    pc_compat_1_7_fn(machine);
>  }
>  
> -static void pc_compat_1_5(MachineState *machine)
> +static void pc_compat_1_5_fn(MachineState *machine)
>  {
> -    pc_compat_1_6(machine);
> +    pc_compat_1_6_fn(machine);
>  }
>  
> -static void pc_compat_1_4(MachineState *machine)
> +static void pc_compat_1_4_fn(MachineState *machine)
>  {
> -    pc_compat_1_5(machine);
> +    pc_compat_1_5_fn(machine);
>  }
>  
>  static void pc_compat_1_3(MachineState *machine)
>  {
> -    pc_compat_1_4(machine);
> +    pc_compat_1_4_fn(machine);
>      enable_compat_apic_id_mode();
>  }
>  
> @@ -609,13 +609,10 @@ DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn,
>  static void pc_i440fx_2_0_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_2_0
> -    };
>  
>      pc_i440fx_2_1_machine_options(m);
>      m->hw_version = "2.0.0";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, pc_compat_2_0, pc_compat_2_0_len);
>      pcmc->smbios_legacy_mode = true;
>      pcmc->has_reserved_memory = false;
>      /* This value depends on the actual DSDT and SSDT compiled into
> @@ -638,73 +635,59 @@ static void pc_i440fx_2_0_machine_options(MachineClass *m)
>      pcmc->acpi_data_size = 0x10000;
>  }
>  
> -DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0,
> +DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0_fn,
>                        pc_i440fx_2_0_machine_options);
>  
>  static void pc_i440fx_1_7_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_1_7
> -    };
>  
>      pc_i440fx_2_0_machine_options(m);
>      m->hw_version = "1.7.0";
>      m->default_machine_opts = NULL;
>      m->option_rom_has_mr = true;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, pc_compat_1_7, pc_compat_1_7_len);
>      pcmc->smbios_defaults = false;
>      pcmc->gigabyte_align = false;
>      pcmc->legacy_acpi_table_size = 6414;
>  }
>  
> -DEFINE_I440FX_MACHINE(v1_7, "pc-i440fx-1.7", pc_compat_1_7,
> +DEFINE_I440FX_MACHINE(v1_7, "pc-i440fx-1.7", pc_compat_1_7_fn,
>                        pc_i440fx_1_7_machine_options);
>  
>  static void pc_i440fx_1_6_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_1_6
> -    };
>  
>      pc_i440fx_1_7_machine_options(m);
>      m->hw_version = "1.6.0";
>      m->rom_file_has_mr = false;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, pc_compat_1_6, pc_compat_1_6_len);
>      pcmc->has_acpi_build = false;
>  }
>  
> -DEFINE_I440FX_MACHINE(v1_6, "pc-i440fx-1.6", pc_compat_1_6,
> +DEFINE_I440FX_MACHINE(v1_6, "pc-i440fx-1.6", pc_compat_1_6_fn,
>                        pc_i440fx_1_6_machine_options);
>  
>  static void pc_i440fx_1_5_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_1_5
> -    };
> -
>      pc_i440fx_1_6_machine_options(m);
>      m->hw_version = "1.5.0";
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, pc_compat_1_5, pc_compat_1_5_len);
>  }
>  
> -DEFINE_I440FX_MACHINE(v1_5, "pc-i440fx-1.5", pc_compat_1_5,
> +DEFINE_I440FX_MACHINE(v1_5, "pc-i440fx-1.5", pc_compat_1_5_fn,
>                        pc_i440fx_1_5_machine_options);
>  
>  static void pc_i440fx_1_4_machine_options(MachineClass *m)
>  {
> -    static GlobalProperty compat[] = {
> -        PC_COMPAT_1_4
> -    };
> -
>      pc_i440fx_1_5_machine_options(m);
>      m->hw_version = "1.4.0";
>      m->hot_add_cpu = NULL;
> -    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> +    compat_props_add(m->compat_props, pc_compat_1_4, pc_compat_1_4_len);
>  }
>  
> -DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4,
> +DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4_fn,
>                        pc_i440fx_1_4_machine_options);
>  
>  static void pc_i440fx_1_3_machine_options(MachineClass *m)

  parent reply	other threads:[~2018-12-27  6:58 UTC|newest]

Thread overview: 80+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-21  9:03 [Qemu-devel] [PATCH v7 00/28] Generalize machine compatibility properties Marc-André Lureau
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 01/28] hw: apply accel compat properties without touching globals Marc-André Lureau
2018-12-21 11:58   ` Cornelia Huck
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 02/28] machines: replace COMPAT define with a static array Marc-André Lureau
2018-12-21 12:33   ` Cornelia Huck
2018-12-21 14:17   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 03/28] hw: apply machine compat properties without touching globals Marc-André Lureau
2018-12-21 12:38   ` Cornelia Huck
2018-12-21 14:20   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 04/28] machine: move compat properties out of globals Marc-André Lureau
2018-12-21 12:44   ` Cornelia Huck
2018-12-21 14:21   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 05/28] hw: remove SET_MACHINE_COMPAT Marc-André Lureau
2018-12-21 12:44   ` Cornelia Huck
2018-12-21 14:22   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 06/28] compat: replace PC_COMPAT_3_1 & HW_COMPAT_3_1 macros Marc-André Lureau
2018-12-21 12:47   ` Cornelia Huck
2018-12-27  6:35   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 07/28] compat: replace PC_COMPAT_3_0 & HW_COMPAT_3_0 macros Marc-André Lureau
2018-12-21 12:50   ` Cornelia Huck
2018-12-27  6:37   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 08/28] compat: replace PC_COMPAT_2_12 & HW_COMPAT_2_12 macros Marc-André Lureau
2018-12-21 12:52   ` Cornelia Huck
2018-12-27  6:39   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 09/28] compat: replace PC_COMPAT_2_11 & HW_COMPAT_2_11 macros Marc-André Lureau
2018-12-21 12:53   ` Cornelia Huck
2018-12-27  6:40   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 10/28] compat: replace PC_COMPAT_2_10 & HW_COMPAT_2_10 macros Marc-André Lureau
2018-12-21 12:55   ` Cornelia Huck
2018-12-27  6:41   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 11/28] compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 macros Marc-André Lureau
2018-12-21 12:56   ` Cornelia Huck
2018-12-27  6:44   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 12/28] compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros Marc-André Lureau
2018-12-21 12:58   ` Cornelia Huck
2018-12-27  6:45   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 13/28] compat: replace PC_COMPAT_2_7 & HW_COMPAT_2_7 macros Marc-André Lureau
2018-12-21 13:00   ` Cornelia Huck
2018-12-27  6:47   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 14/28] compat: replace PC_COMPAT_2_6 & HW_COMPAT_2_6 macros Marc-André Lureau
2018-12-21 13:03   ` Cornelia Huck
2018-12-27  6:48   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 15/28] compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros Marc-André Lureau
2018-12-21 13:04   ` Cornelia Huck
2018-12-27  6:50   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 16/28] compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros Marc-André Lureau
2018-12-21 13:05   ` Cornelia Huck
2018-12-27  6:51   ` Igor Mammedov
2018-12-21  9:03 ` [Qemu-devel] [PATCH v7 17/28] compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros Marc-André Lureau
2018-12-21 13:07   ` Cornelia Huck
2018-12-27  6:52   ` Igor Mammedov
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 18/28] compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros Marc-André Lureau
2018-12-21 13:08   ` Cornelia Huck
2018-12-27  6:53   ` Igor Mammedov
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 19/28] compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros Marc-André Lureau
2018-12-21 13:09   ` Cornelia Huck
2018-12-27  6:54   ` Igor Mammedov
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 20/28] include: remove compat.h Marc-André Lureau
2018-12-21 13:10   ` Cornelia Huck
2018-12-27  6:56   ` Igor Mammedov
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 21/28] compat: remove remaining PC_COMPAT macros Marc-André Lureau
2018-12-21 13:12   ` Cornelia Huck
2018-12-27  6:58   ` Igor Mammedov [this message]
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 22/28] qdev: make a separate helper function to apply compat properties Marc-André Lureau
2018-12-21 14:38   ` Igor Mammedov
2018-12-21 15:25   ` Cornelia Huck
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 23/28] qdev: all globals are now user-provided Marc-André Lureau
2018-12-21 15:26   ` Cornelia Huck
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 24/28] qdev-props: convert global_props to GPtrArray Marc-André Lureau
2018-12-21 15:28   ` Cornelia Huck
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 25/28] qdev-props: remove errp from GlobalProperty Marc-André Lureau
2018-12-21 15:34   ` Cornelia Huck
2019-01-04 10:57     ` Marc-André Lureau
2019-01-04 11:04       ` Cornelia Huck
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 26/28] qdev-props: call object_apply_global_props() Marc-André Lureau
2018-12-21 15:35   ` Cornelia Huck
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 27/28] arm: replace instance_post_init() Marc-André Lureau
2018-12-21  9:04 ` [Qemu-devel] [PATCH v7 28/28] hostmem: use object id for memory region name with >= 4.0 Marc-André Lureau
2019-01-04 11:42 ` [Qemu-devel] [PATCH v7 00/28] Generalize machine compatibility properties Marc-André Lureau
2019-01-04 16:16   ` Eduardo Habkost

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181227075835.4670c6e3@Igors-MacBook-Pro.local \
    --to=imammedo@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).