docs/system/deprecated.rst | 5 ----- docs/system/removed-features.rst | 5 +++++ hw/mips/fuloong2e.c | 1 - 3 files changed, 5 insertions(+), 6 deletions(-)
The 'fulong2e' machine alias has been marked as deprecated since
QEMU v5.1 (commit c3a09ff68dd, the machine is renamed 'fuloong2e').
Time to remove it now.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
docs/system/deprecated.rst | 5 -----
docs/system/removed-features.rst | 5 +++++
hw/mips/fuloong2e.c | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index bacd76d7a58..e20bfcb17a4 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -309,11 +309,6 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or
System emulator machines
------------------------
-mips ``fulong2e`` machine (since 5.1)
-'''''''''''''''''''''''''''''''''''''
-
-This machine has been renamed ``fuloong2e``.
-
``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
index 8b20d78a4d0..430fc33ca18 100644
--- a/docs/system/removed-features.rst
+++ b/docs/system/removed-features.rst
@@ -120,6 +120,11 @@ mips ``r4k`` platform (removed in 5.2)
This machine type was very old and unmaintained. Users should use the ``malta``
machine type instead.
+mips ``fulong2e`` machine alias (removed in 6.0)
+''''''''''''''''''''''''''''''''''''''''''''''''
+
+This machine has been renamed ``fuloong2e``.
+
Related binaries
----------------
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 29805242caa..bac2adbd5ae 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -383,7 +383,6 @@ static void mips_fuloong2e_init(MachineState *machine)
static void mips_fuloong2e_machine_init(MachineClass *mc)
{
mc->desc = "Fuloong 2e mini pc";
- mc->alias = "fulong2e"; /* Incorrect name used up to QEMU 4.2 */
mc->init = mips_fuloong2e_init;
mc->block_default_type = IF_IDE;
mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E");
--
2.26.2
Reviewed-by: Huacai Chen <chenhuacai@kernel.org> On Thu, Jan 7, 2021 at 2:46 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > The 'fulong2e' machine alias has been marked as deprecated since > QEMU v5.1 (commit c3a09ff68dd, the machine is renamed 'fuloong2e'). > Time to remove it now. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > docs/system/deprecated.rst | 5 ----- > docs/system/removed-features.rst | 5 +++++ > hw/mips/fuloong2e.c | 1 - > 3 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index bacd76d7a58..e20bfcb17a4 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -309,11 +309,6 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or > System emulator machines > ------------------------ > > -mips ``fulong2e`` machine (since 5.1) > -''''''''''''''''''''''''''''''''''''' > - > -This machine has been renamed ``fuloong2e``. > - > ``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0) > ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst > index 8b20d78a4d0..430fc33ca18 100644 > --- a/docs/system/removed-features.rst > +++ b/docs/system/removed-features.rst > @@ -120,6 +120,11 @@ mips ``r4k`` platform (removed in 5.2) > This machine type was very old and unmaintained. Users should use the ``malta`` > machine type instead. > > +mips ``fulong2e`` machine alias (removed in 6.0) > +'''''''''''''''''''''''''''''''''''''''''''''''' > + > +This machine has been renamed ``fuloong2e``. > + > Related binaries > ---------------- > > diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c > index 29805242caa..bac2adbd5ae 100644 > --- a/hw/mips/fuloong2e.c > +++ b/hw/mips/fuloong2e.c > @@ -383,7 +383,6 @@ static void mips_fuloong2e_init(MachineState *machine) > static void mips_fuloong2e_machine_init(MachineClass *mc) > { > mc->desc = "Fuloong 2e mini pc"; > - mc->alias = "fulong2e"; /* Incorrect name used up to QEMU 4.2 */ > mc->init = mips_fuloong2e_init; > mc->block_default_type = IF_IDE; > mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E"); > -- > 2.26.2 >
Am Wed, 6 Jan 2021 19:46:02 +0100 schrieb Philippe Mathieu-Daudé <f4bug@amsat.org>: > The 'fulong2e' machine alias has been marked as deprecated since > QEMU v5.1 (commit c3a09ff68dd, the machine is renamed 'fuloong2e'). > Time to remove it now. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > docs/system/deprecated.rst | 5 ----- > docs/system/removed-features.rst | 5 +++++ > hw/mips/fuloong2e.c | 1 - > 3 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index bacd76d7a58..e20bfcb17a4 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -309,11 +309,6 @@ The 'scsi-disk' device is deprecated. Users > should use 'scsi-hd' or System emulator machines > ------------------------ > > -mips ``fulong2e`` machine (since 5.1) > -''''''''''''''''''''''''''''''''''''' > - > -This machine has been renamed ``fuloong2e``. > - > ``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0) > ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > diff --git a/docs/system/removed-features.rst > b/docs/system/removed-features.rst index 8b20d78a4d0..430fc33ca18 > 100644 --- a/docs/system/removed-features.rst > +++ b/docs/system/removed-features.rst > @@ -120,6 +120,11 @@ mips ``r4k`` platform (removed in 5.2) > This machine type was very old and unmaintained. Users should use > the ``malta`` machine type instead. > > +mips ``fulong2e`` machine alias (removed in 6.0) > +'''''''''''''''''''''''''''''''''''''''''''''''' > + > +This machine has been renamed ``fuloong2e``. > + > Related binaries > ---------------- > > diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c > index 29805242caa..bac2adbd5ae 100644 > --- a/hw/mips/fuloong2e.c > +++ b/hw/mips/fuloong2e.c > @@ -383,7 +383,6 @@ static void mips_fuloong2e_init(MachineState > *machine) static void mips_fuloong2e_machine_init(MachineClass *mc) > { > mc->desc = "Fuloong 2e mini pc"; > - mc->alias = "fulong2e"; /* Incorrect name used up to > QEMU 4.2 */ mc->init = mips_fuloong2e_init; > mc->block_default_type = IF_IDE; > mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E"); Reviewed-by: Thomas Huth <huth@tuxfamily.org>
On 1/6/21 7:46 PM, Philippe Mathieu-Daudé wrote: > The 'fulong2e' machine alias has been marked as deprecated since > QEMU v5.1 (commit c3a09ff68dd, the machine is renamed 'fuloong2e'). > Time to remove it now. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > docs/system/deprecated.rst | 5 ----- > docs/system/removed-features.rst | 5 +++++ > hw/mips/fuloong2e.c | 1 - > 3 files changed, 5 insertions(+), 6 deletions(-) Thanks, applied to mips-next.
© 2016 - 2024 Red Hat, Inc.