Re: [PATCH v6 21/21] hw/mips: Rename malta/mipssim/r4k/jazz files in hw/mips

[Philippe Mathieu-Daudé]

On 5/18/20 10:09 PM, Aleksandar Markovic wrote:
> Machine file names should not have prefix "mips_".
> 
> Fuloong2e machine source file will be handled in a separate patch,
> to avoid conflicts. That patch is pending integration into the
> main tree.
> 
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> Signed-off-by: Aleksandar Markovic <address@hidden>
> ---
>  MAINTAINERS                           | 9 ++++-----
>  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
>  6 files changed, 8 insertions(+), 9 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%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 8d5562c5c7..883d15c9d7 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -11,7 +11,6 @@ consult qemu-devel and not any specific individual 
> privately.
>  
>  Descriptions of section entries:
>  
> -     M: Mail patches to: FullName <address@domain>

Thanks, queued to mips-next without removing the 'M' tag description.

>          Maintainers are looking after a certain area and must be CCed on
>          patches. They are considered the main contact point.
>       R: Designated reviewer: FullName <address@domain>
> @@ -1043,7 +1042,7 @@ Jazz
>  M: Hervé Poussineau <address@hidden>
>  R: Aleksandar Rikalo <address@hidden>
>  S: Maintained
> -F: hw/mips/mips_jazz.c
> +F: hw/mips/jazz.c
>  F: hw/display/jazz_led.c
>  F: hw/dma/rc4030.c
>  
> @@ -1054,7 +1053,7 @@ R: Aurelien Jarno <address@hidden>
>  S: Maintained
>  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
>  F: include/hw/southbridge/piix.h
>  F: tests/acceptance/linux_ssh_mips_malta.py
> @@ -1064,7 +1063,7 @@ Mipssim
>  M: Aleksandar Markovic <address@hidden>
>  R: Aleksandar Rikalo <address@hidden>
>  S: Odd Fixes
> -F: hw/mips/mips_mipssim.c
> +F: hw/mips/mipssim.c
>  F: hw/net/mipsnet.c
>  
>  R4000
> @@ -1072,7 +1071,7 @@ M: Aleksandar Markovic <address@hidden>
>  R: Aurelien Jarno <address@hidden>
>  R: Aleksandar Rikalo <address@hidden>
>  S: Obsolete
> -F: hw/mips/mips_r4k.c
> +F: hw/mips/r4k.c
>  
>  Fulong 2E
>  M: Philippe Mathieu-Daudé <address@hidden>
> 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
>