[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v7 18/28] compat: replace PC_COMPAT_2_2 & HW_COM
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH v7 18/28] compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros |
Date: |
Thu, 27 Dec 2018 07:53:55 +0100 |
On Fri, 21 Dec 2018 13:04:00 +0400
Marc-André Lureau <address@hidden> wrote:
> Use static arrays instead. I decided to rename the conflicting
> pc_compat_2_2() function with pc_compat_2_2_fn().
>
> 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 | 97 ++------------------------------------------
> hw/core/machine.c | 3 ++
> hw/i386/pc.c | 95 +++++++++++++++++++++++++++++++++++++++++++
> hw/i386/pc_piix.c | 12 +++---
> hw/ppc/spapr.c | 2 +-
> 7 files changed, 110 insertions(+), 105 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index a51d896a70..0b0a1f4079 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -323,4 +323,7 @@ extern const size_t hw_compat_2_4_len;
> extern GlobalProperty hw_compat_2_3[];
> extern const size_t hw_compat_2_3_len;
>
> +extern GlobalProperty hw_compat_2_2[];
> +extern const size_t hw_compat_2_2_len;
> +
> #endif
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index fbe64d5983..3bd91908e4 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_2_2 \
> - /* empty */
> -
> #define HW_COMPAT_2_1 \
> {\
> .driver = "intel-hda",\
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index def40cd545..49b45bb79d 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -330,6 +330,9 @@ extern const size_t pc_compat_2_4_len;
> extern GlobalProperty pc_compat_2_3[];
> extern const size_t pc_compat_2_3_len;
>
> +extern GlobalProperty pc_compat_2_2[];
> +extern const size_t pc_compat_2_2_len;
> +
> /* Helper for setting model-id for CPU models that changed model-id
> * depending on QEMU versions up to QEMU 2.4.
> */
> @@ -350,100 +353,6 @@ extern const size_t pc_compat_2_3_len;
> .value = "QEMU Virtual CPU version " v,\
> },
>
> -#define PC_COMPAT_2_2 \
> - HW_COMPAT_2_2 \
> - PC_CPU_MODEL_IDS("2.2.0") \
> - {\
> - .driver = "kvm64" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "kvm32" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Conroe" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Penryn" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Nehalem" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Westmere" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "SandyBridge" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Haswell" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Broadwell" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Opteron_G1" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Opteron_G2" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Opteron_G4" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Opteron_G5" "-" TYPE_X86_CPU,\
> - .property = "vme",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Haswell" "-" TYPE_X86_CPU,\
> - .property = "f16c",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Haswell" "-" TYPE_X86_CPU,\
> - .property = "rdrand",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Broadwell" "-" TYPE_X86_CPU,\
> - .property = "f16c",\
> - .value = "off",\
> - },\
> - {\
> - .driver = "Broadwell" "-" TYPE_X86_CPU,\
> - .property = "rdrand",\
> - .value = "off",\
> - },
> -
> #define PC_COMPAT_2_1 \
> HW_COMPAT_2_1 \
> PC_CPU_MODEL_IDS("2.1.0") \
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 449f7ec8f6..8f387e9063 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -296,6 +296,9 @@ GlobalProperty hw_compat_2_3[] = {
> };
> const size_t hw_compat_2_3_len = G_N_ELEMENTS(hw_compat_2_3);
>
> +GlobalProperty hw_compat_2_2[] = {};
> +const size_t hw_compat_2_2_len = G_N_ELEMENTS(hw_compat_2_2);
> +
> 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 c49fceed8e..aeba5a770e 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -435,6 +435,101 @@ GlobalProperty pc_compat_2_3[] = {
> };
> const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3);
>
> +GlobalProperty pc_compat_2_2[] = {
> + PC_CPU_MODEL_IDS("2.2.0")
> + {
> + .driver = "kvm64" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "kvm32" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Conroe" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Penryn" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Nehalem" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Westmere" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "SandyBridge" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Haswell" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Broadwell" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Opteron_G1" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Opteron_G2" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Opteron_G3" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Opteron_G4" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Opteron_G5" "-" TYPE_X86_CPU,
> + .property = "vme",
> + .value = "off",
> + },
> + {
> + .driver = "Haswell" "-" TYPE_X86_CPU,
> + .property = "f16c",
> + .value = "off",
> + },
> + {
> + .driver = "Haswell" "-" TYPE_X86_CPU,
> + .property = "rdrand",
> + .value = "off",
> + },
> + {
> + .driver = "Broadwell" "-" TYPE_X86_CPU,
> + .property = "f16c",
> + .value = "off",
> + },
> + {
> + .driver = "Broadwell" "-" TYPE_X86_CPU,
> + .property = "rdrand",
> + .value = "off",
> + },
> +};
> +const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2);
> +
> 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 d06fdf2bb9..6c250e64fc 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -318,14 +318,14 @@ static void pc_compat_2_3_fn(MachineState *machine)
> }
> }
>
> -static void pc_compat_2_2(MachineState *machine)
> +static void pc_compat_2_2_fn(MachineState *machine)
> {
> pc_compat_2_3_fn(machine);
> }
>
> static void pc_compat_2_1(MachineState *machine)
> {
> - pc_compat_2_2(machine);
> + pc_compat_2_2_fn(machine);
> x86_cpu_change_kvm_default("svm", NULL);
> }
>
> @@ -578,18 +578,16 @@ DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3",
> pc_compat_2_3_fn,
> static void pc_i440fx_2_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> - static GlobalProperty compat[] = {
> - PC_COMPAT_2_2
> - };
>
> pc_i440fx_2_3_machine_options(m);
> m->hw_version = "2.2.0";
> m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on";
> - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
> + compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len);
> + compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len);
> pcmc->rsdp_in_ram = false;
> }
>
> -DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2,
> +DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn,
> pc_i440fx_2_2_machine_options);
>
> static void pc_i440fx_2_1_machine_options(MachineClass *m)
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 29f88f2372..2e71eb08e9 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4282,7 +4282,6 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false);
> static void spapr_machine_2_2_class_options(MachineClass *mc)
> {
> static GlobalProperty compat[] = {
> - HW_COMPAT_2_2
> {
> .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
> .property = "mem_win_size",
> @@ -4291,6 +4290,7 @@ static void
> spapr_machine_2_2_class_options(MachineClass *mc)
> };
>
> spapr_machine_2_3_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len);
> compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> mc->default_machine_opts =
> "modern-hotplug-events=off,suppress-vmdesc=on";
> }
- Re: [Qemu-devel] [PATCH v7 12/28] compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros, (continued)
- [Qemu-devel] [PATCH v7 15/28] compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros, Marc-André Lureau, 2018/12/21
- [Qemu-devel] [PATCH v7 16/28] compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros, Marc-André Lureau, 2018/12/21
- [Qemu-devel] [PATCH v7 18/28] compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros, Marc-André Lureau, 2018/12/21
- [Qemu-devel] [PATCH v7 17/28] compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros, Marc-André Lureau, 2018/12/21
- [Qemu-devel] [PATCH v7 19/28] compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros, Marc-André Lureau, 2018/12/21
- [Qemu-devel] [PATCH v7 20/28] include: remove compat.h, Marc-André Lureau, 2018/12/21
- [Qemu-devel] [PATCH v7 21/28] compat: remove remaining PC_COMPAT macros, Marc-André Lureau, 2018/12/21