Re: [PATCH-for-4.2] hw/mips: Deprecate the r4k machine

[Philippe Mathieu-Daudé]

Hi Aleksandar,

On 11/27/19 7:47 PM, Aleksandar Markovic wrote:
> On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé
> <address@hidden> wrote:
> > The r4k machine was introduced in 2005 (6af0bf9c7) and its last
> > logical change was in 2005 (9542611a6). After we can count 164
> > maintenance commits (QEMU API changes) with the exception of
> > 1 fix in 2015 (memory leak, commit 3ad9fd5a).
> >
> > This machine was introduced as a proof of concept to run a MIPS
> > CPU. 2 years later, the Malta machine was add (commit 5856de80)
> > modeling a real platform.

Since you queued this patch, do you mind adding Aurelien comment to the 
patch description, as it appears important information:

'''
The Linux kernel support for this machine has been dropped more
than 10 years ago in this commit:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=302922e5f6901eb6f29c58539631f71b3d9746b8
'''

I was not sure when sending the patch, but as an improvement, we can 
also remove Aurelien and Aleksandar Rikalo from the MAINTAINERS section.

And I assume we can also add (which was explicit in your previous patch):
Acked-by: Aurelien Jarno <address@hidden>

If you want I can resend this patch with all that amended.

> > Note also this machine has no specification except 5 lines in
> > the header of this file:
> >
> >   * emulates a simple machine with ISA-like bus.
> >   * ISA IO space mapped to the 0x14000000 (PHYS) and
> >   * ISA memory at the 0x10000000 (PHYS, 16Mb in size).
> >   * All peripherial devices are attached to this "bus" with
> >   * the standard PC ISA addresses.
> >
> > It is time to deprecate this obsolete machine. Users are
> > recommended to use the Malta board, which hardware is well
> > documented.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> > ---
> >   qemu-deprecated.texi | 5 +++++
> >   hw/mips/mips_r4k.c   | 1 +
> >   MAINTAINERS          | 2 +-
> >   3 files changed, 7 insertions(+), 1 deletion(-)
>
> Applied to MIPS queue.
>
> > diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
> > index 4b4b7425ac..05265b43c8 100644
> > --- a/qemu-deprecated.texi
> > +++ b/qemu-deprecated.texi
> > @@ -266,6 +266,11 @@ The 'scsi-disk' device is deprecated. Users should use 
> > 'scsi-hd' or
> >
> >   @section System emulator machines
> >
> > +@subsection mips r4k platform (since 4.2)
> > +
> > +This machine type is very old and unmaintained. Users should use the 'malta'
> > +machine type instead.
> > +
> >   @subsection pc-0.12, pc-0.13, pc-0.14 and pc-0.15 (since 4.0)
> >
> >   These machine types are very old and likely can not be used for live migration
> > diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> > index 70024235ae..0b79ad26cb 100644
> > --- a/hw/mips/mips_r4k.c
> > +++ b/hw/mips/mips_r4k.c
> > @@ -294,6 +294,7 @@ void mips_r4k_init(MachineState *machine)
> >
> >   static void mips_machine_init(MachineClass *mc)
> >   {
> > +    mc->deprecation_reason = "use malta machine type instead";
> >       mc->desc = "mips r4k platform";
> >       mc->init = mips_r4k_init;
> >       mc->block_default_type = IF_IDE;
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 5e5e3e52d6..3b3a88e264 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -972,7 +972,7 @@ F: hw/net/mipsnet.c
> >   R4000
> >   M: Aurelien Jarno <address@hidden>
> >   R: Aleksandar Rikalo <address@hidden>
> > -S: Maintained
> > +S: Obsolete
> >   F: hw/mips/mips_r4k.c
> >
> >   Fulong 2E
> > --
> > 2.21.0