Re: [PATCH v4 19/19] hw/mips: Rename malta/mipssim/r4k/jazz files in hw/mips

[Aleksandar Markovic]

нед, 17. мај 2020. у 15:19 Philippe Mathieu-Daudé <address@hidden> је
написао/ла:
>
> Hi Aleksandar,
>
> On 5/17/20 11:23 AM, Aleksandar Markovic wrote:
> > Machine file names should not have prefix "mips_".
> >
> > Folong2 machine source file will be handled in a separate patch,
>
> Typo: "Fuloong2e"
>
> > to avoid conflicts. That patch is pending integration into the
> > main tree.
> >
> > Signed-off-by: Aleksandar Markovic <address@hidden>
> > CC:  Philippe Mathieu-Daudé <address@hidden>
> > ---
> >   hw/mips/Makefile.objs                 | 8 ++++----
> >   hw/mips/{mips_jazz.c => jazz.c}       | 0
> >   hw/mips/{mips_malta.c => malta.c}     | 0
> >   hw/mips/{mips_mipssim.c => mipssim.c} | 0
> >   hw/mips/{mips_r4k.c => r4k.c}         | 0
> >   5 files changed, 4 insertions(+), 4 deletions(-)
> >   rename hw/mips/{mips_jazz.c => jazz.c} (100%)
> >   rename hw/mips/{mips_malta.c => malta.c} (100%)
> >   rename hw/mips/{mips_mipssim.c => mipssim.c} (100%)
> >   rename hw/mips/{mips_r4k.c => r4k.c} (100%)
>
> Thanks for cleaning this, appreciated!
>
> You missed MAINTAINERS:
>

Ouch! You are right. Will be fixed..

Thanks,
Aleksandar

> -- >8 --
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1f84e3ae2c..3ad904a73c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1045,3 +1045,3 @@ R: Aleksandar Rikalo <address@hidden>
>   S: Maintained
> -F: hw/mips/mips_jazz.c
> +F: hw/mips/jazz.c
>   F: hw/display/jazz_led.c
> @@ -1056,3 +1056,3 @@ F: hw/isa/piix4.c
>   F: hw/acpi/piix4.c
> -F: hw/mips/mips_malta.c
> +F: hw/mips/malta.c
>   F: hw/mips/gt64xxx_pci.c
> @@ -1066,3 +1066,3 @@ R: Aleksandar Rikalo <address@hidden>
>   S: Odd Fixes
> -F: hw/mips/mips_mipssim.c
> +F: hw/mips/mipssim.c
>   F: hw/net/mipsnet.c
> @@ -1074,3 +1074,3 @@ R: Aleksandar Rikalo <address@hidden>
>   S: Obsolete
> -F: hw/mips/mips_r4k.c
> +F: hw/mips/r4k.c
>
> ---
>
> With this snippet amended:
>
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> Tested-by: Philippe Mathieu-Daudé <address@hidden>
>
> Regards,
>
> Phil.
>
> >
> > diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
> > index 525809af07..1d767ed9a8 100644
> > --- a/hw/mips/Makefile.objs
> > +++ b/hw/mips/Makefile.objs
> > @@ -1,8 +1,8 @@
> >   obj-y += addr.o mips_int.o
> > -obj-$(CONFIG_R4K) += mips_r4k.o
> > -obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o
> > -obj-$(CONFIG_MIPSSIM) += mips_mipssim.o
> > -obj-$(CONFIG_JAZZ) += mips_jazz.o
> > +obj-$(CONFIG_R4K) += r4k.o
> > +obj-$(CONFIG_MALTA) += gt64xxx_pci.o malta.o
> > +obj-$(CONFIG_MIPSSIM) += mipssim.o
> > +obj-$(CONFIG_JAZZ) += jazz.o
> >   obj-$(CONFIG_FULONG) += mips_fulong2e.o
> >   obj-$(CONFIG_MIPS_CPS) += cps.o
> >   obj-$(CONFIG_MIPS_BOSTON) += boston.o
> > diff --git a/hw/mips/mips_jazz.c b/hw/mips/jazz.c
> > similarity index 100%
> > rename from hw/mips/mips_jazz.c
> > rename to hw/mips/jazz.c
> > diff --git a/hw/mips/mips_malta.c b/hw/mips/malta.c
> > similarity index 100%
> > rename from hw/mips/mips_malta.c
> > rename to hw/mips/malta.c
> > diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mipssim.c
> > similarity index 100%
> > rename from hw/mips/mips_mipssim.c
> > rename to hw/mips/mipssim.c
> > diff --git a/hw/mips/mips_r4k.c b/hw/mips/r4k.c
> > similarity index 100%
> > rename from hw/mips/mips_r4k.c
> > rename to hw/mips/r4k.c
> >