| Message ID | 20250502185652.67370-8-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On Fri, May 02, 2025 at 08:56:39PM +0200, Philippe Mathieu-Daudé wrote: > Date: Fri, 2 May 2025 20:56:39 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v3 07/19] hw/i386/pc: Remove pc_compat_2_6[] array > X-Mailer: git-send-email 2.47.1 > > 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> > --- > include/hw/i386/pc.h | 3 --- > hw/i386/pc.c | 8 -------- > 2 files changed, 11 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a3de3e9560d..4fb2033bc54 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -292,9 +292,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) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 49632b69d29..7573b880905 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -251,14 +251,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