| Message ID | 20250501183628.87479-10-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On 01/05/2025 19:36, Philippe Mathieu-Daudé wrote: > The pc_compat_2_7[] array was only used by the pc-q35-2.7 > and pc-i440fx-2.7 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/hw/i386/pc.h | 3 --- > hw/i386/pc.c | 10 ---------- > 2 files changed, 13 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 4fb2033bc54..319ec82f709 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -289,9 +289,6 @@ extern const size_t pc_compat_2_9_len; > extern GlobalProperty pc_compat_2_8[]; > extern const size_t pc_compat_2_8_len; > > -extern GlobalProperty pc_compat_2_7[]; > -extern const size_t pc_compat_2_7_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 7573b880905..ee7095c89a8 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -241,16 +241,6 @@ GlobalProperty pc_compat_2_8[] = { > }; > const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); > > -GlobalProperty pc_compat_2_7[] = { > - { TYPE_X86_CPU, "l3-cache", "off" }, > - { TYPE_X86_CPU, "full-cpuid-auto-level", "off" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" }, > - { "isa-pcspk", "migrate", "off" }, > -}; > -const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); > - > /* > * @PC_FW_DATA: > * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> ATB, Mark.
On 01/05/2025 20.36, Philippe Mathieu-Daudé wrote: > The pc_compat_2_7[] array was only used by the pc-q35-2.7 > and pc-i440fx-2.7 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/hw/i386/pc.h | 3 --- > hw/i386/pc.c | 10 ---------- > 2 files changed, 13 deletions(-) > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 4fb2033bc54..319ec82f709 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -289,9 +289,6 @@ extern const size_t pc_compat_2_9_len; > extern GlobalProperty pc_compat_2_8[]; > extern const size_t pc_compat_2_8_len; > > -extern GlobalProperty pc_compat_2_7[]; > -extern const size_t pc_compat_2_7_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 7573b880905..ee7095c89a8 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -241,16 +241,6 @@ GlobalProperty pc_compat_2_8[] = { > }; > const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); > > -GlobalProperty pc_compat_2_7[] = { > - { TYPE_X86_CPU, "l3-cache", "off" }, > - { TYPE_X86_CPU, "full-cpuid-auto-level", "off" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" }, > - { "isa-pcspk", "migrate", "off" }, > -}; > -const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); Missing clean-up patches for l3-cache and full-cpuid-auto-level? Thomas
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4fb2033bc54..319ec82f709 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -289,9 +289,6 @@ extern const size_t pc_compat_2_9_len; extern GlobalProperty pc_compat_2_8[]; extern const size_t pc_compat_2_8_len; -extern GlobalProperty pc_compat_2_7[]; -extern const size_t pc_compat_2_7_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 7573b880905..ee7095c89a8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -241,16 +241,6 @@ GlobalProperty pc_compat_2_8[] = { }; const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); -GlobalProperty pc_compat_2_7[] = { - { TYPE_X86_CPU, "l3-cache", "off" }, - { TYPE_X86_CPU, "full-cpuid-auto-level", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" }, - { "isa-pcspk", "migrate", "off" }, -}; -const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
The pc_compat_2_7[] array was only used by the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 10 ---------- 2 files changed, 13 deletions(-)