On Wed, 3 Dec 2025 00:28:24 +0800
Zhao Liu <zhao1.liu@intel.com> wrote:
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
>
> The pc_compat_2_6[] array was only used by the pc-q35-2.6
> and pc-i440fx-2.6 machines, which got removed. Remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/i386/pc.c | 8 --------
> include/hw/i386/pc.h | 3 ---
> 2 files changed, 11 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 2e315414aeaf..85d12f8d0389 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -263,14 +263,6 @@ GlobalProperty pc_compat_2_7[] = {
> };
> const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7);
>
> -GlobalProperty pc_compat_2_6[] = {
> - { TYPE_X86_CPU, "cpuid-0xb", "off" },
> - { "vmxnet3", "romfile", "" },
> - { TYPE_X86_CPU, "fill-mtrr-mask", "off" },
> - { "apic-common", "legacy-instance-id", "on", }
> -};
> -const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6);
> -
> /*
> * @PC_FW_DATA:
> * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 698e3fb84af0..f8f317aee197 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -295,9 +295,6 @@ extern const size_t pc_compat_2_8_len;
> extern GlobalProperty pc_compat_2_7[];
> 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 DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
> static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
> const void *data) \