| Message ID | 20250508133550.81391-12-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On Thu, May 08, 2025 at 03:35:34PM +0200, Philippe Mathieu-Daudé wrote: > Date: Thu, 8 May 2025 15:35:34 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v4 11/27] 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> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.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>
On Thu, 8 May 2025 15:35:34 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > 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. see my comment in 1/27 > > 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> > --- > include/hw/i386/pc.h | 3 --- > hw/i386/pc.c | 8 -------- > 2 files changed, 11 deletions(-) > > 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 4e6fe68e2e0..65a11ea8f99 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
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 4e6fe68e2e0..65a11ea8f99 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