| Message ID | 20240529051539.71210-17-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On Wed, 29 May 2024 07:15:32 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The pc-i440fx-2.2 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 | 23 ----------------------- > hw/i386/pc_piix.c | 21 --------------------- > 5 files changed, 2 insertions(+), 49 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 5b4753e5dc..0fa45aba8b 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.2`` 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.3`` 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 9b0e2f11de..5d7bb4354b 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.1`` (removed in 4.0 up to 9.0) > +``pc-0.10`` up to ``pc-i440fx-2.2`` (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 1351e73ee0..996495985e 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -279,9 +279,6 @@ extern const size_t pc_compat_2_4_len; > extern GlobalProperty pc_compat_2_3[]; > extern const size_t pc_compat_2_3_len; > > -extern GlobalProperty pc_compat_2_2[]; > -extern const size_t pc_compat_2_2_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 c7d44420a5..ccfcb92605 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -289,29 +289,6 @@ GlobalProperty pc_compat_2_3[] = { > }; > const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); > > -GlobalProperty pc_compat_2_2[] = { > - PC_CPU_MODEL_IDS("2.2.0") > - { "kvm64" "-" TYPE_X86_CPU, "vme", "off" }, > - { "kvm32" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Conroe" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Penryn" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Nehalem" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Westmere" "-" TYPE_X86_CPU, "vme", "off" }, > - { "SandyBridge" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Haswell" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Broadwell" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Opteron_G1" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Opteron_G2" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Opteron_G3" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Opteron_G4" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Opteron_G5" "-" TYPE_X86_CPU, "vme", "off" }, > - { "Haswell" "-" TYPE_X86_CPU, "f16c", "off" }, > - { "Haswell" "-" TYPE_X86_CPU, "rdrand", "off" }, > - { "Broadwell" "-" TYPE_X86_CPU, "f16c", "off" }, > - { "Broadwell" "-" TYPE_X86_CPU, "rdrand", "off" }, > -}; > -const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2); > - > 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 e0b421dd51..1343fd93e7 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -429,11 +429,6 @@ static void pc_compat_2_3_fn(MachineState *machine) > } > } > > -static void pc_compat_2_2_fn(MachineState *machine) > -{ > - pc_compat_2_3_fn(machine); > -} > - > #ifdef CONFIG_ISAPC > static void pc_init_isa(MachineState *machine) > { > @@ -843,22 +838,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) > DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, > pc_i440fx_2_3_machine_options); > > -static void pc_i440fx_2_2_machine_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - > - pc_i440fx_2_3_machine_options(m); > - m->hw_version = "2.2.0"; > - m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on"; > - compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len); > - compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len); > - pcmc->rsdp_in_ram = false; > - pcmc->resizable_acpi_blob = false; > -} > - > -DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, > - pc_i440fx_2_2_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 5b4753e5dc..0fa45aba8b 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.2`` 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.3`` 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 9b0e2f11de..5d7bb4354b 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.1`` (removed in 4.0 up to 9.0) +``pc-0.10`` up to ``pc-i440fx-2.2`` (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 1351e73ee0..996495985e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -279,9 +279,6 @@ extern const size_t pc_compat_2_4_len; extern GlobalProperty pc_compat_2_3[]; extern const size_t pc_compat_2_3_len; -extern GlobalProperty pc_compat_2_2[]; -extern const size_t pc_compat_2_2_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 c7d44420a5..ccfcb92605 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -289,29 +289,6 @@ GlobalProperty pc_compat_2_3[] = { }; const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); -GlobalProperty pc_compat_2_2[] = { - PC_CPU_MODEL_IDS("2.2.0") - { "kvm64" "-" TYPE_X86_CPU, "vme", "off" }, - { "kvm32" "-" TYPE_X86_CPU, "vme", "off" }, - { "Conroe" "-" TYPE_X86_CPU, "vme", "off" }, - { "Penryn" "-" TYPE_X86_CPU, "vme", "off" }, - { "Nehalem" "-" TYPE_X86_CPU, "vme", "off" }, - { "Westmere" "-" TYPE_X86_CPU, "vme", "off" }, - { "SandyBridge" "-" TYPE_X86_CPU, "vme", "off" }, - { "Haswell" "-" TYPE_X86_CPU, "vme", "off" }, - { "Broadwell" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G1" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G2" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "vme", "off" }, - { "Haswell" "-" TYPE_X86_CPU, "f16c", "off" }, - { "Haswell" "-" TYPE_X86_CPU, "rdrand", "off" }, - { "Broadwell" "-" TYPE_X86_CPU, "f16c", "off" }, - { "Broadwell" "-" TYPE_X86_CPU, "rdrand", "off" }, -}; -const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2); - 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 e0b421dd51..1343fd93e7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -429,11 +429,6 @@ static void pc_compat_2_3_fn(MachineState *machine) } } -static void pc_compat_2_2_fn(MachineState *machine) -{ - pc_compat_2_3_fn(machine); -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -843,22 +838,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, pc_i440fx_2_3_machine_options); -static void pc_i440fx_2_2_machine_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_2_3_machine_options(m); - m->hw_version = "2.2.0"; - m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on"; - compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len); - compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len); - pcmc->rsdp_in_ram = false; - pcmc->resizable_acpi_blob = false; -} - -DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, - pc_i440fx_2_2_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {