| Message ID | 20191125104103.28962-1-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PATCH-for-4.2] hw/mips: Deprecate the r4k machine | expand |
On Monday, November 25, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> 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). > > Please don't start any deprecation process. This requires certain consultation within my company. Rest assured that everyone's opinion will be taken into account while doing consiltation. Aleksandar 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. > > 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é <philmd@redhat.com> > --- > qemu-deprecated.texi | 5 +++++ > hw/mips/mips_r4k.c | 1 + > MAINTAINERS | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) > > 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 <aurelien@aurel32.net> > R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > -S: Maintained > +S: Obsolete > F: hw/mips/mips_r4k.c > > Fulong 2E > -- > 2.21.0 > > >
On 11/25/19 3:45 PM, Aleksandar Markovic wrote: > > > On Monday, November 25, 2019, Philippe Mathieu-Daudé <philmd@redhat.com > <mailto:philmd@redhat.com>> 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). > > > Please don't start any deprecation process. This requires certain > consultation within my company. Rest assured that everyone's opinion > will be taken into account while doing consiltation. While I think both listed maintainers need to confirm this patch (Aurelien and Aleksandar Rikalo), anyone is welcome to object :) Aurelien already acked to step down: https://www.mail-archive.com/qemu-devel@nongnu.org/msg658363.html We will wait for your consultation. Meanwhile, patch postponed to 5.0. > 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. > > 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é <philmd@redhat.com > <mailto:philmd@redhat.com>> > --- > qemu-deprecated.texi | 5 +++++ > hw/mips/mips_r4k.c | 1 + > MAINTAINERS | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) > > 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 <aurelien@aurel32.net <mailto:aurelien@aurel32.net>> > R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com > <mailto:aleksandar.rikalo@rt-rk.com>> > -S: Maintained > +S: Obsolete > F: hw/mips/mips_r4k.c > > Fulong 2E > -- > 2.21.0 > >
On 2019-11-25 11:41, Philippe Mathieu-Daudé 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. > > 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é <philmd@redhat.com> > --- > qemu-deprecated.texi | 5 +++++ > hw/mips/mips_r4k.c | 1 + > MAINTAINERS | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) 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 therefore think it's time to also drop support for it on the QEMU side.
On Mon, Nov 25, 2019 at 03:45:35PM +0100, Aleksandar Markovic wrote: > On Monday, November 25, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> > 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). > > > > > Please don't start any deprecation process. This requires certain > consultation within my company. Rest assured that everyone's opinion will > be taken into account while doing consiltation. The idea of having a deprecation process is precisely to allow time for people like to provide feedback before any deletion takes place. So this is not a reason to delay starting of deprecation. The process lasts for 2 releases before we delete anything: https://qemu.weilnetz.de/doc/qemu-doc.html#Deprecated-features When we start the clock now, it is deprecated when 5.0 releases in April 2020, and still deprecated with 5.1 in August 2020. The code won't be deleted until Sep 2020 when 5.2 dev cycle opens, and there's still time to undelete it right up until the 5.2 feature freeze in late Oct 2020. That's 11 months away, which is plenty of time for feedback IMHO. Regards, Daniel
On 11/25/19 9:40 AM, Daniel P. Berrangé wrote: >> Please don't start any deprecation process. This requires certain >> consultation within my company. Rest assured that everyone's opinion will >> be taken into account while doing consiltation. > > The idea of having a deprecation process is precisely to > allow time for people like to provide feedback before any > deletion takes place. So this is not a reason to delay > starting of deprecation. > > The process lasts for 2 releases before we delete anything: > > https://qemu.weilnetz.de/doc/qemu-doc.html#Deprecated-features > > When we start the clock now, it is deprecated when 5.0 releases > in April 2020, and still deprecated with 5.1 in August 2020. > > The code won't be deleted until Sep 2020 when 5.2 dev cycle opens, > and there's still time to undelete it right up until the 5.2 feature > freeze in late Oct 2020. That's 11 months away, which is plenty of > time for feedback IMHO. And that's the soonest it could be removed. If your consultation reports back that it is still needed, we can reverse the decision to deprecate or extend the deprecation to last longer, as needed, rather than blindly removing at the first possible moment.
On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé <philmd@redhat.com> 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. > > 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é <philmd@redhat.com> > --- Philippe, I see you added "libvir-list" in "cc". Was it a mistake, or there was some purpose? Yours, Aleksandar > qemu-deprecated.texi | 5 +++++ > hw/mips/mips_r4k.c | 1 + > MAINTAINERS | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) > > 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 <aurelien@aurel32.net> > R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > -S: Maintained > +S: Obsolete > F: hw/mips/mips_r4k.c > > Fulong 2E > -- > 2.21.0 > >
Hi Aleksandar, On 11/26/19 9:46 PM, Aleksandar Markovic wrote: > On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé > <philmd@redhat.com> 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. >> >> 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é <philmd@redhat.com> >> --- > > Philippe, > > I see you added "libvir-list" in "cc". Was it a mistake, or there was > some purpose? I don't pick the series recipient manually, I send my series with git-publish. Here it used the default QEMU profile. All profiles call git-sendmail with the cc-cmd set to the get_maintainer.pl script: $ cat .gitpublish # # Common git-publish profiles that can be used to send patches to QEMU upstream. # # See https://github.com/stefanha/git-publish for more information # [gitpublishprofile "default"] base = master to = qemu-devel@nongnu.org cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null Having a closer look, libvir-list list was Cc'ed because it is listed as reviewer of the qemu-deprecated.texi file, which was modified. ./scripts/get_maintainer.pl -f qemu-deprecated.texi libvir-list@redhat.com (reviewer:Incompatible changes) qemu-devel@nongnu.org (open list:All patches CC here) >> qemu-deprecated.texi | 5 +++++ >> hw/mips/mips_r4k.c | 1 + >> MAINTAINERS | 2 +- >> 3 files changed, 7 insertions(+), 1 deletion(-) >> >> 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 <aurelien@aurel32.net> >> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> >> -S: Maintained >> +S: Obsolete >> F: hw/mips/mips_r4k.c >> >> Fulong 2E >> -- >> 2.21.0 >> >> >
On Tuesday, November 26, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > Hi Aleksandar, > > On 11/26/19 9:46 PM, Aleksandar Markovic wrote: > >> On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé >> <philmd@redhat.com> 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. >>> >>> 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é <philmd@redhat.com> >>> --- >>> >> >> Philippe, >> >> I see you added "libvir-list" in "cc". Was it a mistake, or there was >> some purpose? >> > > I don't pick the series recipient manually, I send my series with > git-publish. Here it used the default QEMU profile. > > All profiles call git-sendmail with the cc-cmd set to the > get_maintainer.pl script: > > $ cat .gitpublish > # > # Common git-publish profiles that can be used to send patches to QEMU > upstream. > # > # See https://github.com/stefanha/git-publish for more information > # > [gitpublishprofile "default"] > base = master > to = qemu-devel@nongnu.org > cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit > --nogit-fallback 2>/dev/null > > Having a closer look, libvir-list list was Cc'ed because it is listed as > reviewer of the qemu-deprecated.texi file, which was modified. > > ./scripts/get_maintainer.pl -f qemu-deprecated.texi > libvir-list@redhat.com (reviewer:Incompatible changes) > qemu-devel@nongnu.org (open list:All patches CC here) > > OK. No problem. It just looked strange. As far as consuktations, I am just waiting for some responses within company to establish if somebody is perhaps using this machine with some ancient kernel. I got some opinions that are in favor of R4000 machine deprecating, but I need to wait for all relevant departments to confirm. What happened to TileGX? Yours, Aleksandar > qemu-deprecated.texi | 5 +++++ >>> hw/mips/mips_r4k.c | 1 + >>> MAINTAINERS | 2 +- >>> 3 files changed, 7 insertions(+), 1 deletion(-) >>> >>> 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 <aurelien@aurel32.net> >>> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> >>> -S: Maintained >>> +S: Obsolete >>> F: hw/mips/mips_r4k.c >>> >>> Fulong 2E >>> -- >>> 2.21.0 >>> >>> >>> >> >
On Tue, Nov 26, 2019 at 11:03 PM Aleksandar Markovic <aleksandar.m.mail@gmail.com> wrote: > On Tuesday, November 26, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >> >> Hi Aleksandar, >> >> On 11/26/19 9:46 PM, Aleksandar Markovic wrote: >>> >>> On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé >>> <philmd@redhat.com> 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. >>>> >>>> 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é <philmd@redhat.com> >>>> --- >>> >>> >>> Philippe, >>> >>> I see you added "libvir-list" in "cc". Was it a mistake, or there was >>> some purpose? >> >> >> I don't pick the series recipient manually, I send my series with git-publish. Here it used the default QEMU profile. >> >> All profiles call git-sendmail with the cc-cmd set to the get_maintainer.pl script: >> >> $ cat .gitpublish >> # >> # Common git-publish profiles that can be used to send patches to QEMU upstream. >> # >> # See https://github.com/stefanha/git-publish for more information >> # >> [gitpublishprofile "default"] >> base = master >> to = qemu-devel@nongnu.org >> cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null >> >> Having a closer look, libvir-list list was Cc'ed because it is listed as reviewer of the qemu-deprecated.texi file, which was modified. >> >> ./scripts/get_maintainer.pl -f qemu-deprecated.texi >> libvir-list@redhat.com (reviewer:Incompatible changes) >> qemu-devel@nongnu.org (open list:All patches CC here) >> > > OK. No problem. It just looked strange. > > As far as consuktations, I am just waiting for some responses within company to establish if somebody is perhaps using this machine with some ancient kernel. I got some opinions that are in favor of R4000 machine deprecating, but I need to wait for all relevant departments to confirm. > > What happened to TileGX? Peter Maydell suggested to postpone deprecations for after 4.2, since we are already at rc3 (and deprecating a target involves modifying the ./configure script). [...]
On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé <philmd@redhat.com> 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. > > 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é <philmd@redhat.com> > --- > qemu-deprecated.texi | 5 +++++ > hw/mips/mips_r4k.c | 1 + > MAINTAINERS | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > 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 <aurelien@aurel32.net> > R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > -S: Maintained > +S: Obsolete > F: hw/mips/mips_r4k.c > > Fulong 2E > -- > 2.21.0 > >
On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé <philmd@redhat.com> 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. > > 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é <philmd@redhat.com> > --- > 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 <aurelien@aurel32.net> > R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > -S: Maintained > +S: Obsolete > F: hw/mips/mips_r4k.c > > Fulong 2E > -- > 2.21.0 > >
On Mon, Nov 25, 2019 at 4:40 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > > On Mon, Nov 25, 2019 at 03:45:35PM +0100, Aleksandar Markovic wrote: > > On Monday, November 25, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> > > 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). > > > > > > > > Please don't start any deprecation process. This requires certain > > consultation within my company. Rest assured that everyone's opinion will > > be taken into account while doing consiltation. > > The idea of having a deprecation process is precisely to > allow time for people like to provide feedback before any > deletion takes place. So this is not a reason to delay > starting of deprecation. > What you said is fine, Daniel, I understand the idea, and it should be that way. But I didn't ask for some lengthy negotiation, or waiting for someone for months, but I just wanted to check within company if all relevant people (that do not read QEMU devel list very often) agree - since we, naturally, do various in-house setups with QEMU for MIPS, that's all. This could count as the discussion on the patch, not as a part of that loooooong "deprecated" state... All is well, Aleksandar > The process lasts for 2 releases before we delete anything: > > https://qemu.weilnetz.de/doc/qemu-doc.html#Deprecated-features > > When we start the clock now, it is deprecated when 5.0 releases > in April 2020, and still deprecated with 5.1 in August 2020. > > The code won't be deleted until Sep 2020 when 5.2 dev cycle opens, > and there's still time to undelete it right up until the 5.2 feature > freeze in late Oct 2020. That's 11 months away, which is plenty of > time for feedback IMHO. > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| >
On 11/27/19 8:40 PM, Aleksandar Markovic wrote: > On Mon, Nov 25, 2019 at 4:40 PM Daniel P. Berrangé <berrange@redhat.com> wrote: >> >> On Mon, Nov 25, 2019 at 03:45:35PM +0100, Aleksandar Markovic wrote: >>> On Monday, November 25, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> >>> 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). >>>> >>>> >>> Please don't start any deprecation process. This requires certain >>> consultation within my company. Rest assured that everyone's opinion will >>> be taken into account while doing consiltation. >> >> The idea of having a deprecation process is precisely to >> allow time for people like to provide feedback before any >> deletion takes place. So this is not a reason to delay >> starting of deprecation. >> > > What you said is fine, Daniel, I understand the idea, and it should be > that way. But I didn't ask for some lengthy negotiation, or waiting > for someone for months, but I just wanted to check within company if > all relevant people (that do not read QEMU devel list very often) > agree - since we, naturally, do various in-house setups with QEMU for > MIPS, that's all. This could count as the discussion on the patch, not > as a part of that loooooong "deprecated" state... Thank you Aleksandar for clearing that with MIPS so quickly! >> The process lasts for 2 releases before we delete anything: >> >> https://qemu.weilnetz.de/doc/qemu-doc.html#Deprecated-features >> >> When we start the clock now, it is deprecated when 5.0 releases >> in April 2020, and still deprecated with 5.1 in August 2020. >> >> The code won't be deleted until Sep 2020 when 5.2 dev cycle opens, >> and there's still time to undelete it right up until the 5.2 feature >> freeze in late Oct 2020. That's 11 months away, which is plenty of >> time for feedback IMHO. >> >> Regards, >> Daniel >> -- >> |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| >> |: https://libvirt.org -o- https://fstop138.berrange.com :| >> |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| >> >
Hi Aleksandar, On 11/27/19 7:47 PM, Aleksandar Markovic wrote: > On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé > <philmd@redhat.com> 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 <aurelien@aurel32.net> 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é <philmd@redhat.com> >> --- >> 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 <aurelien@aurel32.net> >> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> >> -S: Maintained >> +S: Obsolete >> F: hw/mips/mips_r4k.c >> >> Fulong 2E >> -- >> 2.21.0 >> >> >
On Wed, Nov 27, 2019 at 10:17 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Hi Aleksandar, > > On 11/27/19 7:47 PM, Aleksandar Markovic wrote: > > On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé > > <philmd@redhat.com> 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 > ''' > Sure. > I was not sure when sending the patch, but as an improvement, we can > also remove Aurelien and Aleksandar Rikalo from the MAINTAINERS section. > I would leave that section intact please. They are currently formally in charge of this machine, and if they have been so by now for so long time, let them be the same even during deprecation period. I would of course remove the patch related to R4000 maintainership fro my separate series covering chang in the maintainership, since it really loses any sense. > And I assume we can also add (which was explicit in your previous patch): > Acked-by: Aurelien Jarno <aurelien@aurel32.net> > OK. > 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é <philmd@redhat.com> > >> --- > >> 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 <aurelien@aurel32.net> > >> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > >> -S: Maintained > >> +S: Obsolete > >> F: hw/mips/mips_r4k.c > >> > >> Fulong 2E > >> -- > >> 2.21.0 > >> > >> > > >
On Wed, Nov 27, 2019 at 10:17 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Hi Aleksandar, > > On 11/27/19 7:47 PM, Aleksandar Markovic wrote: > > On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé > > <philmd@redhat.com> 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 <aurelien@aurel32.net> > > If you want I can resend this patch with all that amended. > No need to resend, I'll fix the things while applying. > >> 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é <philmd@redhat.com> > >> --- > >> 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 <aurelien@aurel32.net> > >> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> > >> -S: Maintained > >> +S: Obsolete > >> F: hw/mips/mips_r4k.c > >> > >> Fulong 2E > >> -- > >> 2.21.0 > >> > >> > > >
On 11/27/19 10:31 PM, Aleksandar Markovic wrote: > On Wed, Nov 27, 2019 at 10:17 PM Philippe Mathieu-Daudé > <philmd@redhat.com> wrote: >> >> Hi Aleksandar, >> >> On 11/27/19 7:47 PM, Aleksandar Markovic wrote: >>> On Mon, Nov 25, 2019 at 11:41 AM Philippe Mathieu-Daudé >>> <philmd@redhat.com> 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 <aurelien@aurel32.net> >> >> If you want I can resend this patch with all that amended. >> > > No need to resend, I'll fix the things while applying. Thank you very much, very appreciated!
Hi, On 25/11/2019 11.41, Philippe Mathieu-Daudé wrote: [...] > 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) Since the patch has now been merged after the release of 4.2, the mips 4k platform will be deprecated in 5.0 instead. Could you send a patch to fix it up? Thanks, Thomas
Hi, On 12/17/19 7:43 PM, Aleksandar Markovic wrote: > From: Thomas Huth <thuth@redhat.com> > Sent: Tuesday, December 17, 2019 7:10 PM > To: Philippe Mathieu-Daudé; qemu-devel@nongnu.org > Cc: libvir-list@redhat.com; Hervé Poussineau; Aleksandar Markovic; Aleksandar Rikalo; Aurelien Jarno > Subject: [EXTERNAL]Re: [PATCH-for-4.2] hw/mips: Deprecate the r4k machine > > Hi, > > On 25/11/2019 11.41, Philippe Mathieu-Daudé wrote: >>> 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) >> >> Since the patch has now been merged after the release of 4.2, the mips >> 4k platform will be deprecated in 5.0 instead. Could you send a patch to >> fix it up? > > OK, I'll send a patch that'll certainly be applied to the next MIPS queue. > > Thanks for spotting this, Thomas. > > Aleksandar Any update on this? Thanks, Phil.
On 9/4/20 6:57 PM, Philippe Mathieu-Daudé wrote: > Hi, > > On 12/17/19 7:43 PM, Aleksandar Markovic wrote: >> From: Thomas Huth <thuth@redhat.com> >> Sent: Tuesday, December 17, 2019 7:10 PM >> To: Philippe Mathieu-Daudé; qemu-devel@nongnu.org >> Cc: libvir-list@redhat.com; Hervé Poussineau; Aleksandar Markovic; Aleksandar Rikalo; Aurelien Jarno >> Subject: [EXTERNAL]Re: [PATCH-for-4.2] hw/mips: Deprecate the r4k machine >> >> Hi, >> >> On 25/11/2019 11.41, Philippe Mathieu-Daudé wrote: >>>> 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) >>> >>> Since the patch has now been merged after the release of 4.2, the mips >>> 4k platform will be deprecated in 5.0 instead. Could you send a patch to >>> fix it up? >> >> OK, I'll send a patch that'll certainly be applied to the next MIPS queue. >> >> Thanks for spotting this, Thomas. >> >> Aleksandar > > Any update on this? Thomas told me this has been already merged as commit 2048d5d4bce ("target/mips: Rectify documentation on deprecating MIPS r4k machine"). I'm sorry I missed it. > > Thanks, > > Phil. >
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 <aurelien@aurel32.net> R: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> -S: Maintained +S: Obsolete F: hw/mips/mips_r4k.c Fulong 2E
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. 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é <philmd@redhat.com> --- qemu-deprecated.texi | 5 +++++ hw/mips/mips_r4k.c | 1 + MAINTAINERS | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-)