motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-30 13:31:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines

Browse source 
These machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6f "docs: document special exception for machine type
deprecation & removal") they can now be removed.

Remove the now unused empty pc_compat_2_5[] array.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Message-ID: <20250512083948.39294-10-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2025-05-12 10:39:38 +02:00 • committed by Thomas Huth
parent 47d9e81f0a
commit ff63280a81
4 changed files with 0 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/i386/pc.c
View file

@ -259,9 +259,6 @@ GlobalProperty pc_compat_2_6[] = {
}; };
const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_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);
/* /*
* @PC_FW_DATA: * @PC_FW_DATA:
* Size of the chunk of memory at the top of RAM for the BIOS ACPI tables * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables

13
hw/i386/pc_piix.c
View file

@ -778,19 +778,6 @@ static void pc_i440fx_machine_2_6_options(MachineClass *m)
DEFINE_I440FX_MACHINE(2, 6); DEFINE_I440FX_MACHINE(2, 6);
static void pc_i440fx_machine_2_5_options(MachineClass *m)
{
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
pc_i440fx_machine_2_6_options(m);
x86mc->save_tsc_khz = false;
m->legacy_fw_cfg_order = 1;
compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len);
compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len);
}
DEFINE_I440FX_MACHINE(2, 5);
#ifdef CONFIG_ISAPC #ifdef CONFIG_ISAPC
static void isapc_machine_options(MachineClass *m) static void isapc_machine_options(MachineClass *m)
{ {

13
hw/i386/pc_q35.c
View file

@ -672,16 +672,3 @@ static void pc_q35_machine_2_6_options(MachineClass *m)
} }
DEFINE_Q35_MACHINE(2, 6); DEFINE_Q35_MACHINE(2, 6);
static void pc_q35_machine_2_5_options(MachineClass *m)
{
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
pc_q35_machine_2_6_options(m);
x86mc->save_tsc_khz = false;
m->legacy_fw_cfg_order = 1;
compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len);
compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len);
}
DEFINE_Q35_MACHINE(2, 5);

3
include/hw/i386/pc.h
View file

@ -298,9 +298,6 @@ extern const size_t pc_compat_2_7_len;
extern GlobalProperty pc_compat_2_6[]; extern GlobalProperty pc_compat_2_6[];
extern const size_t pc_compat_2_6_len; extern const size_t pc_compat_2_6_len;
extern GlobalProperty pc_compat_2_5[];
extern const size_t pc_compat_2_5_len;
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
const void *data) \ const void *data) \