| Message ID | 20240529051539.71210-21-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On 29/05/2024 07.15, Philippe Mathieu-Daudé wrote: > The pc-i440fx-2.3 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> > --- > docs/about/deprecated.rst | 4 ++-- > docs/about/removed-features.rst | 2 +- > hw/i386/pc.c | 25 ------------------------- > hw/i386/pc_piix.c | 19 ------------------- > 4 files changed, 3 insertions(+), 47 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On Wed, May 29, 2024 at 07:15:36AM +0200, Philippe Mathieu-Daudé wrote: > Date: Wed, 29 May 2024 07:15:36 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v5 20/23] hw/i386/pc: Remove deprecated pc-i440fx-2.3 > machine > X-Mailer: git-send-email 2.41.0 > > The pc-i440fx-2.3 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> > --- > docs/about/deprecated.rst | 4 ++-- > docs/about/removed-features.rst | 2 +- > hw/i386/pc.c | 25 ------------------------- > hw/i386/pc_piix.c | 19 ------------------- > 4 files changed, 3 insertions(+), 47 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
On Wed, 29 May 2024 07:15:36 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The pc-i440fx-2.3 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: Igor Mammedov <imammedo@redhat.com> > --- > docs/about/deprecated.rst | 4 ++-- > docs/about/removed-features.rst | 2 +- > hw/i386/pc.c | 25 ------------------------- > hw/i386/pc_piix.c | 19 ------------------- > 4 files changed, 3 insertions(+), 47 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 0fa45aba8b..3d004a0818 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -228,8 +228,8 @@ 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.3`` 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.4`` up to ``pc-i440fx-2.12`` (since 9.1) > +'''''''''''''''''''''''''''''''''''''''''''''''''''''' > > These old machine types are quite neglected nowadays and thus might have > various pitfalls with regards to live migration. Use a newer machine type > diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst > index 5d7bb4354b..2cbbd03cfd 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.2`` (removed in 4.0 up to 9.0) > +``pc-0.10`` up to ``pc-i440fx-2.3`` (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/hw/i386/pc.c b/hw/i386/pc.c > index 8e51d1f1bb..b84c8ddba0 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -264,31 +264,6 @@ GlobalProperty pc_compat_2_4[] = { > }; > const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); > > -GlobalProperty pc_compat_2_3[] = { > - PC_CPU_MODEL_IDS("2.3.0") > - { TYPE_X86_CPU, "arat", "off" }, > - { "qemu64" "-" TYPE_X86_CPU, "min-level", "4" }, > - { "kvm64" "-" TYPE_X86_CPU, "min-level", "5" }, > - { "pentium3" "-" TYPE_X86_CPU, "min-level", "2" }, > - { "n270" "-" TYPE_X86_CPU, "min-level", "5" }, > - { "Conroe" "-" TYPE_X86_CPU, "min-level", "4" }, > - { "Penryn" "-" TYPE_X86_CPU, "min-level", "4" }, > - { "Nehalem" "-" TYPE_X86_CPU, "min-level", "4" }, > - { "n270" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Penryn" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Conroe" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Nehalem" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Westmere" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "SandyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "IvyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Haswell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Haswell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Broadwell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { "Broadwell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, > - { TYPE_X86_CPU, "kvm-no-smi-migration", "on" }, > -}; > -const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); > - > 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 1343fd93e7..217c749705 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -421,14 +421,6 @@ static void pc_set_south_bridge(Object *obj, int value, Error **errp) > * hw_compat_*, pc_compat_*, or * pc_*_machine_options(). > */ > > -static void pc_compat_2_3_fn(MachineState *machine) > -{ > - X86MachineState *x86ms = X86_MACHINE(machine); > - if (kvm_enabled()) { > - x86ms->smm = ON_OFF_AUTO_OFF; > - } > -} > - > #ifdef CONFIG_ISAPC > static void pc_init_isa(MachineState *machine) > { > @@ -827,17 +819,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) > DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, > pc_i440fx_2_4_machine_options) > > -static void pc_i440fx_2_3_machine_options(MachineClass *m) > -{ > - pc_i440fx_2_4_machine_options(m); > - m->hw_version = "2.3.0"; > - compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len); > - compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len); > -} > - > -DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, > - pc_i440fx_2_3_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 0fa45aba8b..3d004a0818 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -228,8 +228,8 @@ 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.3`` 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.4`` up to ``pc-i440fx-2.12`` (since 9.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 5d7bb4354b..2cbbd03cfd 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.2`` (removed in 4.0 up to 9.0) +``pc-0.10`` up to ``pc-i440fx-2.3`` (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/hw/i386/pc.c b/hw/i386/pc.c index 8e51d1f1bb..b84c8ddba0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -264,31 +264,6 @@ GlobalProperty pc_compat_2_4[] = { }; const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); -GlobalProperty pc_compat_2_3[] = { - PC_CPU_MODEL_IDS("2.3.0") - { TYPE_X86_CPU, "arat", "off" }, - { "qemu64" "-" TYPE_X86_CPU, "min-level", "4" }, - { "kvm64" "-" TYPE_X86_CPU, "min-level", "5" }, - { "pentium3" "-" TYPE_X86_CPU, "min-level", "2" }, - { "n270" "-" TYPE_X86_CPU, "min-level", "5" }, - { "Conroe" "-" TYPE_X86_CPU, "min-level", "4" }, - { "Penryn" "-" TYPE_X86_CPU, "min-level", "4" }, - { "Nehalem" "-" TYPE_X86_CPU, "min-level", "4" }, - { "n270" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Penryn" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Conroe" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Nehalem" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Westmere" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "SandyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "IvyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Haswell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Haswell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Broadwell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Broadwell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { TYPE_X86_CPU, "kvm-no-smi-migration", "on" }, -}; -const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); - 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 1343fd93e7..217c749705 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -421,14 +421,6 @@ static void pc_set_south_bridge(Object *obj, int value, Error **errp) * hw_compat_*, pc_compat_*, or * pc_*_machine_options(). */ -static void pc_compat_2_3_fn(MachineState *machine) -{ - X86MachineState *x86ms = X86_MACHINE(machine); - if (kvm_enabled()) { - x86ms->smm = ON_OFF_AUTO_OFF; - } -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -827,17 +819,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, pc_i440fx_2_4_machine_options) -static void pc_i440fx_2_3_machine_options(MachineClass *m) -{ - pc_i440fx_2_4_machine_options(m); - m->hw_version = "2.3.0"; - compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len); - compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len); -} - -DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, - pc_i440fx_2_3_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {
The pc-i440fx-2.3 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> --- docs/about/deprecated.rst | 4 ++-- docs/about/removed-features.rst | 2 +- hw/i386/pc.c | 25 ------------------------- hw/i386/pc_piix.c | 19 ------------------- 4 files changed, 3 insertions(+), 47 deletions(-)