On Mon, 12 May 2025 10:39:32 +0200
Philippe Mathieu-Daudé <phi...@linaro.org> wrote:
> The pc_compat_2_4[] array was only used by the pc-q35-2.4
> and pc-i440fx-2.4 machines, which got removed. Remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
> Reviewed-by: Zhao Liu <zhao1....@intel.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> include/hw/i386/pc.h | 3 ---
> hw/i386/pc.c | 19 -------------------
> 2 files changed, 22 deletions(-)
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index f4a874b17fc..b34aa25fdce 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -301,9 +301,6 @@ extern const size_t pc_compat_2_6_len;
> extern GlobalProperty pc_compat_2_5[];
> extern const size_t pc_compat_2_5_len;
>
> -extern GlobalProperty pc_compat_2_4[];
> -extern const size_t pc_compat_2_4_len;
> -
> #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
> static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
> const void *data) \
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index c8bb4a3ee47..2b46714a5ac 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -262,25 +262,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);
>
> -GlobalProperty pc_compat_2_4[] = {
> - PC_CPU_MODEL_IDS("2.4.0")
> - { "Haswell-" TYPE_X86_CPU, "abm", "off" },
> - { "Haswell-noTSX-" TYPE_X86_CPU, "abm", "off" },
> - { "Broadwell-" TYPE_X86_CPU, "abm", "off" },
> - { "Broadwell-noTSX-" TYPE_X86_CPU, "abm", "off" },
> - { "host" "-" TYPE_X86_CPU, "host-cache-info", "on" },
> - { TYPE_X86_CPU, "check", "off" },
> - { "qemu64" "-" TYPE_X86_CPU, "sse4a", "on" },
> - { "qemu64" "-" TYPE_X86_CPU, "abm", "on" },
> - { "qemu64" "-" TYPE_X86_CPU, "popcnt", "on" },
> - { "qemu32" "-" TYPE_X86_CPU, "popcnt", "on" },
> - { "Opteron_G2" "-" TYPE_X86_CPU, "rdtscp", "on" },
> - { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "on" },
> - { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "on" },
> - { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "on", }
> -};
> -const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4);
> -
> /*
> * @PC_FW_DATA:
> * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
