| Message ID | 20240529051539.71210-9-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On Wed, 29 May 2024 07:15:24 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The pc-i440fx-2.1 machine was deprecated for the 8.2 > release (see commit c7437f0ddb "docs/about: Mark the > old pc-i440fx-2.0 - 2.3 machine types as deprecated"), > time to remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > docs/about/deprecated.rst | 2 +- > docs/about/removed-features.rst | 2 +- > include/hw/i386/pc.h | 3 --- > hw/i386/pc.c | 7 ------- > hw/i386/pc_piix.c | 23 ----------------------- > 5 files changed, 2 insertions(+), 35 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 629f6a1566..5b4753e5dc 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -228,7 +228,7 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name > better reflects the way this property affects all random data within > the device tree blob, not just the ``kaslr-seed`` node. > > -``pc-i440fx-2.1`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) > +``pc-i440fx-2.2`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) > '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > These old machine types are quite neglected nowadays and thus might have > diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst > index 5f0c2d8ec2..9b0e2f11de 100644 > --- a/docs/about/removed-features.rst > +++ b/docs/about/removed-features.rst > @@ -925,7 +925,7 @@ mips ``fulong2e`` machine alias (removed in 6.0) > > This machine has been renamed ``fuloong2e``. > > -``pc-0.10`` up to ``pc-i440fx-2.0`` (removed in 4.0 up to 9.0) > +``pc-0.10`` up to ``pc-i440fx-2.1`` (removed in 4.0 up to 9.0) > '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > These machine types were very old and likely could not be used for live > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 01fdcfaeb6..db0f8e0e36 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -286,9 +286,6 @@ extern const size_t pc_compat_2_3_len; > extern GlobalProperty pc_compat_2_2[]; > extern const size_t pc_compat_2_2_len; > > -extern GlobalProperty pc_compat_2_1[]; > -extern const size_t pc_compat_2_1_len; > - > #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ > static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ > { \ > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 11182e09ce..f27c9fd98c 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -312,13 +312,6 @@ GlobalProperty pc_compat_2_2[] = { > }; > const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2); > > -GlobalProperty pc_compat_2_1[] = { > - PC_CPU_MODEL_IDS("2.1.0") > - { "coreduo" "-" TYPE_X86_CPU, "vmx", "on" }, > - { "core2duo" "-" TYPE_X86_CPU, "vmx", "on" }, > -}; > -const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1); > - > GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) > { > GSIState *s; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index a750a0e6ab..e0b421dd51 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -66,7 +66,6 @@ > #include "hw/hyperv/vmbus-bridge.h" > #include "hw/mem/nvdimm.h" > #include "hw/i386/acpi-build.h" > -#include "kvm/kvm-cpu.h" > #include "target/i386/cpu.h" > > #define XEN_IOAPIC_NUM_PIRQS 128ULL > @@ -435,12 +434,6 @@ static void pc_compat_2_2_fn(MachineState *machine) > pc_compat_2_3_fn(machine); > } > > -static void pc_compat_2_1_fn(MachineState *machine) > -{ > - pc_compat_2_2_fn(machine); > - x86_cpu_change_kvm_default("svm", NULL); > -} > - > #ifdef CONFIG_ISAPC > static void pc_init_isa(MachineState *machine) > { > @@ -866,22 +859,6 @@ static void pc_i440fx_2_2_machine_options(MachineClass *m) > DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, > pc_i440fx_2_2_machine_options); > > -static void pc_i440fx_2_1_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - > - pc_i440fx_2_2_machine_options(m); > - m->hw_version = "2.1.0"; > - m->default_display = NULL; > - compat_props_add(m->compat_props, hw_compat_2_1, hw_compat_2_1_len); > - compat_props_add(m->compat_props, pc_compat_2_1, pc_compat_2_1_len); > - pcmc->smbios_uuid_encoded = false; > - pcmc->enforce_aligned_dimm = false; > -} > - > -DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn, > - pc_i440fx_2_1_machine_options); > - > #ifdef CONFIG_ISAPC > static void isapc_machine_options(MachineClass *m) > {
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 629f6a1566..5b4753e5dc 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -228,7 +228,7 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name better reflects the way this property affects all random data within the device tree blob, not just the ``kaslr-seed`` node. -``pc-i440fx-2.1`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) +``pc-i440fx-2.2`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 5f0c2d8ec2..9b0e2f11de 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -925,7 +925,7 @@ mips ``fulong2e`` machine alias (removed in 6.0) This machine has been renamed ``fuloong2e``. -``pc-0.10`` up to ``pc-i440fx-2.0`` (removed in 4.0 up to 9.0) +``pc-0.10`` up to ``pc-i440fx-2.1`` (removed in 4.0 up to 9.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These machine types were very old and likely could not be used for live diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 01fdcfaeb6..db0f8e0e36 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -286,9 +286,6 @@ extern const size_t pc_compat_2_3_len; extern GlobalProperty pc_compat_2_2[]; extern const size_t pc_compat_2_2_len; -extern GlobalProperty pc_compat_2_1[]; -extern const size_t pc_compat_2_1_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ { \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 11182e09ce..f27c9fd98c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -312,13 +312,6 @@ GlobalProperty pc_compat_2_2[] = { }; const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2); -GlobalProperty pc_compat_2_1[] = { - PC_CPU_MODEL_IDS("2.1.0") - { "coreduo" "-" TYPE_X86_CPU, "vmx", "on" }, - { "core2duo" "-" TYPE_X86_CPU, "vmx", "on" }, -}; -const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1); - GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) { GSIState *s; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a750a0e6ab..e0b421dd51 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -66,7 +66,6 @@ #include "hw/hyperv/vmbus-bridge.h" #include "hw/mem/nvdimm.h" #include "hw/i386/acpi-build.h" -#include "kvm/kvm-cpu.h" #include "target/i386/cpu.h" #define XEN_IOAPIC_NUM_PIRQS 128ULL @@ -435,12 +434,6 @@ static void pc_compat_2_2_fn(MachineState *machine) pc_compat_2_3_fn(machine); } -static void pc_compat_2_1_fn(MachineState *machine) -{ - pc_compat_2_2_fn(machine); - x86_cpu_change_kvm_default("svm", NULL); -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -866,22 +859,6 @@ static void pc_i440fx_2_2_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, pc_i440fx_2_2_machine_options); -static void pc_i440fx_2_1_machine_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_2_2_machine_options(m); - m->hw_version = "2.1.0"; - m->default_display = NULL; - compat_props_add(m->compat_props, hw_compat_2_1, hw_compat_2_1_len); - compat_props_add(m->compat_props, pc_compat_2_1, pc_compat_2_1_len); - pcmc->smbios_uuid_encoded = false; - pcmc->enforce_aligned_dimm = false; -} - -DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn, - pc_i440fx_2_1_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {