diff mbox series

[2/3] MAINTAINERS: Improve section headlines

Message ID 20190529150853.9772-3-armbru@redhat.com
State New
Headers show
Series MAINTAINERS: Clean up and improve section headlines | expand

Commit Message

Markus Armbruster May 29, 2019, 3:08 p.m. UTC
When scripts/get_maintainer.pl reports something like

    John Doe <jdoe@example.org> (maintainer:Overall)

the user is left to wonder *which* of our three "Overall" sections
applies.  We have three, one each under "Guest CPU cores (TCG)",
"Guest CPU Cores (KVM)", and "Overall usermode emulation".

Rename sections under

* "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"

* "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"

* "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"

* "Architecture support" from "FOO" to "FOO general architecture
  support"

* "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"

While there,

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

Comments

Eric Blake May 29, 2019, 3:16 p.m. UTC | #1
On 5/29/19 10:08 AM, Markus Armbruster wrote:
> When scripts/get_maintainer.pl reports something like
> 
>     John Doe <jdoe@example.org> (maintainer:Overall)
> 
> the user is left to wonder *which* of our three "Overall" sections
> applies.  We have three, one each under "Guest CPU cores (TCG)",
> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
> 
> Rename sections under
> 
> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
> 
> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
> 
> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
> 
> * "Architecture support" from "FOO" to "FOO general architecture
>   support"
> 
> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
> 
> While there,
> 

Unintentional truncation? Or leftover thought that should be removed
after you instead split things?

> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>  1 file changed, 39 insertions(+), 39 deletions(-)
Philippe Mathieu-Daudé May 29, 2019, 3:56 p.m. UTC | #2
On 5/29/19 5:16 PM, Eric Blake wrote:
> On 5/29/19 10:08 AM, Markus Armbruster wrote:
>> When scripts/get_maintainer.pl reports something like
>>
>>     John Doe <jdoe@example.org> (maintainer:Overall)
>>
>> the user is left to wonder *which* of our three "Overall" sections
>> applies.  We have three, one each under "Guest CPU cores (TCG)",
>> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>>
>> Rename sections under
>>
>> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>>
>> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>>
>> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>>
>> * "Architecture support" from "FOO" to "FOO general architecture
>>   support"
>>
>> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>>
>> While there,
>>
> 
> Unintentional truncation? Or leftover thought that should be removed
> after you instead split things?

leftover :)

"While there, polish headline decorations"

> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>>  1 file changed, 39 insertions(+), 39 deletions(-)
>
Philippe Mathieu-Daudé May 29, 2019, 4:03 p.m. UTC | #3
On 5/29/19 5:08 PM, Markus Armbruster wrote:
> When scripts/get_maintainer.pl reports something like
> 
>     John Doe <jdoe@example.org> (maintainer:Overall)
> 
> the user is left to wonder *which* of our three "Overall" sections
> applies.  We have three, one each under "Guest CPU cores (TCG)",
> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
> 
> Rename sections under
> 
> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
> 
> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
> 
> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
> 
> * "Architecture support" from "FOO" to "FOO general architecture
>   support"
> 
> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"

I find the "cores" pattern more confusing now :S

> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>  1 file changed, 39 insertions(+), 39 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index edc260e503..196282d165 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -83,7 +83,7 @@ T: git https://github.com/vivier/qemu.git trivial-patches
>  
>  Architecture support
>  --------------------
> -S390
> +S390 general architecture support

OK

>  M: Cornelia Huck <cohuck@redhat.com>
>  S: Supported
>  F: default-configs/s390x-softmmu.mak
> @@ -108,7 +108,7 @@ L: qemu-s390x@nongnu.org
>  
>  Guest CPU cores (TCG):
>  ----------------------
> -Overall
> +Overall CPU cores (TCG)

What about "TCG (Overall)"?

>  M: Richard Henderson <rth@twiddle.net>
>  R: Paolo Bonzini <pbonzini@redhat.com>
>  S: Maintained
> @@ -133,14 +133,14 @@ F: fpu/
>  F: include/fpu/
>  F: tests/fp/
>  
> -Alpha
> +Alpha CPU cores (TCG)

I find "cores" confusing here, why not use "Alpha CPU (TCG)"?

>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: target/alpha/
>  F: tests/tcg/alpha/
>  F: disas/alpha.c
>  
> -ARM
> +ARM CPU cores (TCG)

Ditto.

>  M: Peter Maydell <peter.maydell@linaro.org>
>  L: qemu-arm@nongnu.org
>  S: Maintained
> @@ -161,7 +161,7 @@ S: Maintained
>  F: hw/arm/smmu*
>  F: include/hw/arm/smmu*
>  
> -CRIS
> +CRIS CPU cores (TCG)
>  M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>  S: Maintained
>  F: target/cris/
> @@ -170,14 +170,14 @@ F: include/hw/cris/
>  F: tests/tcg/cris/
>  F: disas/cris.c
>  
> -HPPA (PA-RISC)
> +HPPA (PA-RISC) CPU cores (TCG)
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: target/hppa/
>  F: hw/hppa/
>  F: disas/hppa.c
>  
> -LM32
> +LM32 CPU cores (TCG)
>  M: Michael Walle <michael@walle.cc>
>  S: Maintained
>  F: target/lm32/
> @@ -190,20 +190,20 @@ F: include/hw/char/lm32_juart.h
>  F: include/hw/lm32/
>  F: tests/tcg/lm32/
>  
> -M68K
> +M68K CPU cores (TCG)
>  M: Laurent Vivier <laurent@vivier.eu>
>  S: Maintained
>  F: target/m68k/
>  F: disas/m68k.c
>  
> -MicroBlaze
> +MicroBlaze CPU cores (TCG)
>  M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>  S: Maintained
>  F: target/microblaze/
>  F: hw/microblaze/
>  F: disas/microblaze.c
>  
> -MIPS
> +MIPS CPU cores (TCG)
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  M: Aleksandar Markovic <amarkovic@wavecomp.com>
>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
> @@ -224,7 +224,7 @@ F: include/hw/timer/mips_gictimer.h
>  F: tests/tcg/mips/
>  K: ^Subject:.*(?i)mips
>  
> -Moxie
> +Moxie CPU cores (TCG)
>  M: Anthony Green <green@moxielogic.com>
>  S: Maintained
>  F: target/moxie/
> @@ -232,7 +232,7 @@ F: disas/moxie.c
>  F: hw/moxie/
>  F: default-configs/moxie-softmmu.mak
>  
> -NiosII
> +NiosII CPU cores (TCG)
>  M: Chris Wulff <crwulff@gmail.com>
>  M: Marek Vasut <marex@denx.de>
>  S: Maintained
> @@ -242,14 +242,14 @@ F: hw/intc/nios2_iic.c
>  F: disas/nios2.c
>  F: default-configs/nios2-softmmu.mak
>  
> -OpenRISC
> +OpenRISC CPU cores (TCG)
>  M: Stafford Horne <shorne@gmail.com>
>  S: Odd Fixes
>  F: target/openrisc/
>  F: hw/openrisc/
>  F: tests/tcg/openrisc/
>  
> -PowerPC
> +PowerPC CPU cores (TCG)
>  M: David Gibson <david@gibson.dropbear.id.au>
>  L: qemu-ppc@nongnu.org
>  S: Maintained
> @@ -258,7 +258,7 @@ F: hw/ppc/
>  F: include/hw/ppc/
>  F: disas/ppc.c
>  
> -RISC-V
> +RISC-V CPU cores (TCG)
>  M: Palmer Dabbelt <palmer@sifive.com>
>  M: Alistair Francis <Alistair.Francis@wdc.com>
>  M: Sagar Karandikar <sagark@eecs.berkeley.edu>
> @@ -271,7 +271,7 @@ F: include/hw/riscv/
>  F: linux-user/host/riscv32/
>  F: linux-user/host/riscv64/
>  
> -S390
> +S390 CPU cores (TCG)
>  M: Richard Henderson <rth@twiddle.net>
>  M: David Hildenbrand <david@redhat.com>
>  S: Maintained
> @@ -281,7 +281,7 @@ F: disas/s390.c
>  F: tests/tcg/s390x/
>  L: qemu-s390x@nongnu.org
>  
> -SH4
> +SH4 CPU cores (TCG)
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  S: Odd Fixes
>  F: target/sh4/
> @@ -289,7 +289,7 @@ F: hw/sh4/
>  F: disas/sh4.c
>  F: include/hw/sh4/
>  
> -SPARC
> +SPARC CPU cores (TCG)
>  M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>  M: Artyom Tarasenko <atar4qemu@gmail.com>
>  S: Maintained
> @@ -299,14 +299,14 @@ F: hw/sparc64/
>  F: include/hw/sparc/sparc64.h
>  F: disas/sparc.c
>  
> -UniCore32
> +UniCore32 CPU cores (TCG)
>  M: Guan Xuetao <gxt@mprc.pku.edu.cn>
>  S: Maintained
>  F: target/unicore32/
>  F: hw/unicore32/
>  F: include/hw/unicore32/
>  
> -X86
> +X86 CPU cores (TCG)
>  M: Paolo Bonzini <pbonzini@redhat.com>
>  M: Richard Henderson <rth@twiddle.net>
>  M: Eduardo Habkost <ehabkost@redhat.com>
> @@ -319,7 +319,7 @@ F: disas/i386.c
>  F: docs/qemu-cpu-models.texi
>  T: git https://github.com/ehabkost/qemu.git x86-next
>  
> -Xtensa
> +Xtensa CPU cores (TCG)
>  M: Max Filippov <jcmvbkbc@gmail.com>
>  W: http://wiki.osll.ru/doku.php?id=etc:users:jcmvbkbc:qemu-target-xtensa
>  S: Maintained
> @@ -330,7 +330,7 @@ F: disas/xtensa.c
>  F: include/hw/xtensa/xtensa-isa.h
>  F: default-configs/xtensa*.mak
>  
> -TriCore
> +TriCore CPU cores (TCG)
>  M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
>  S: Maintained
>  F: target/tricore/
> @@ -345,7 +345,7 @@ F: tests/tcg/multiarch/
>  Guest CPU Cores (KVM):
>  ----------------------
>  
> -Overall
> +Overall CPU cores (KVM)

"KVM (Overall)"?

>  M: Paolo Bonzini <pbonzini@redhat.com>
>  L: kvm@vger.kernel.org
>  S: Supported
> @@ -356,24 +356,24 @@ F: include/hw/kvm/
>  F: include/sysemu/kvm*.h
>  F: scripts/kvm/kvm_flightrecorder
>  
> -ARM
> +ARM CPU cores (KVM)

"ARM CPU (KVM)"?

>  M: Peter Maydell <peter.maydell@linaro.org>
>  L: qemu-arm@nongnu.org
>  S: Maintained
>  F: target/arm/kvm.c
>  
> -MIPS
> +MIPS CPU cores (KVM)
>  M: James Hogan <jhogan@kernel.org>
>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>  S: Maintained
>  F: target/mips/kvm.c
>  
> -PPC
> +PPC CPU cores (KVM)
>  M: David Gibson <david@gibson.dropbear.id.au>
>  S: Maintained
>  F: target/ppc/kvm.c
>  
> -S390
> +S390 CPU cores (KVM)
>  M: Halil Pasic <pasic@linux.ibm.com>
>  M: Cornelia Huck <cohuck@redhat.com>
>  M: Christian Borntraeger <borntraeger@de.ibm.com>
> @@ -392,7 +392,7 @@ T: git https://github.com/cohuck/qemu.git s390-next
>  T: git https://github.com/borntraeger/qemu.git s390-next
>  L: qemu-s390x@nongnu.org
>  
> -X86
> +X86 CPU cores (KVM)
>  M: Paolo Bonzini <pbonzini@redhat.com>
>  M: Marcelo Tosatti <mtosatti@redhat.com>
>  L: kvm@vger.kernel.org
> @@ -403,7 +403,7 @@ F: scripts/kvm/vmxcap
>  Guest CPU Cores (Xen):
>  ----------------------
>  
> -X86
> +X86 CPU cores (Xen)
>  M: Stefano Stabellini <sstabellini@kernel.org>
>  M: Anthony Perard <anthony.perard@citrix.com>
>  M: Paul Durrant <paul.durrant@citrix.com>
> @@ -2256,7 +2256,7 @@ F: tests/uefi-test-tools/
>  
>  Usermode Emulation
>  ------------------
> -Overall
> +Overall usermode emulation

"Usermode Emulation (Overall)"?

>  M: Riku Voipio <riku.voipio@iki.fi>
>  S: Maintained
>  F: thunk.c
> @@ -2282,7 +2282,7 @@ M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: tcg/
>  
> -AArch64 target
> +AArch64 TCG target
>  M: Claudio Fontana <claudio.fontana@huawei.com>
>  M: Claudio Fontana <claudio.fontana@gmail.com>
>  S: Maintained
> @@ -2291,33 +2291,33 @@ F: tcg/aarch64/
>  F: disas/arm-a64.cc
>  F: disas/libvixl/
>  
> -ARM target
> +ARM TCG target
>  M: Andrzej Zaborowski <balrogg@gmail.com>
>  S: Maintained
>  L: qemu-arm@nongnu.org
>  F: tcg/arm/
>  F: disas/arm.c
>  
> -i386 target
> +i386 TCG target
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: tcg/i386/
>  F: disas/i386.c
>  
> -MIPS target
> +MIPS TCG target
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>  S: Maintained
>  F: tcg/mips/
>  F: disas/mips.c
>  
> -PPC
> +PPC TCG target
>  M: Richard Henderson <rth@twiddle.net>
>  S: Odd Fixes
>  F: tcg/ppc/
>  F: disas/ppc.c
>  
> -RISC-V
> +RISC-V TCG target
>  M: Palmer Dabbelt <palmer@sifive.com>
>  M: Alistair Francis <Alistair.Francis@wdc.com>
>  L: qemu-riscv@nongnu.org
> @@ -2325,19 +2325,19 @@ S: Maintained
>  F: tcg/riscv/
>  F: disas/riscv.c
>  
> -S390 target
> +S390 TCG target
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: tcg/s390/
>  F: disas/s390.c
>  L: qemu-s390x@nongnu.org
>  
> -SPARC target
> +SPARC TCG target
>  S: Odd Fixes
>  F: tcg/sparc/
>  F: disas/sparc.c
>  
> -TCI target
> +TCI TCG target
>  M: Stefan Weil <sw@weilnetz.de>
>  S: Maintained
>  F: tcg/tci/
>
Markus Armbruster May 29, 2019, 7:09 p.m. UTC | #4
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 5/29/19 5:16 PM, Eric Blake wrote:
>> On 5/29/19 10:08 AM, Markus Armbruster wrote:
>>> When scripts/get_maintainer.pl reports something like
>>>
>>>     John Doe <jdoe@example.org> (maintainer:Overall)
>>>
>>> the user is left to wonder *which* of our three "Overall" sections
>>> applies.  We have three, one each under "Guest CPU cores (TCG)",
>>> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>>>
>>> Rename sections under
>>>
>>> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>>>
>>> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>>>
>>> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>>>
>>> * "Architecture support" from "FOO" to "FOO general architecture
>>>   support"
>>>
>>> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>>>
>>> While there,
>>>
>> 
>> Unintentional truncation? Or leftover thought that should be removed
>> after you instead split things?
>
> leftover :)
>
> "While there, polish headline decorations"

You're reading my distracted mind.
Markus Armbruster May 29, 2019, 7:16 p.m. UTC | #5
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 5/29/19 5:08 PM, Markus Armbruster wrote:
>> When scripts/get_maintainer.pl reports something like
>> 
>>     John Doe <jdoe@example.org> (maintainer:Overall)
>> 
>> the user is left to wonder *which* of our three "Overall" sections
>> applies.  We have three, one each under "Guest CPU cores (TCG)",
>> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>> 
>> Rename sections under
>> 
>> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>> 
>> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>> 
>> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>> 
>> * "Architecture support" from "FOO" to "FOO general architecture
>>   support"
>> 
>> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>
> I find the "cores" pattern more confusing now :S

Then let's find less confusing headlines together.

>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>>  1 file changed, 39 insertions(+), 39 deletions(-)
>> 
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index edc260e503..196282d165 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -83,7 +83,7 @@ T: git https://github.com/vivier/qemu.git trivial-patches
>>  
>>  Architecture support
>>  --------------------
>> -S390
>> +S390 general architecture support
>
> OK
>
>>  M: Cornelia Huck <cohuck@redhat.com>
>>  S: Supported
>>  F: default-configs/s390x-softmmu.mak
>> @@ -108,7 +108,7 @@ L: qemu-s390x@nongnu.org
>>  
>>  Guest CPU cores (TCG):
>>  ----------------------
>> -Overall
>> +Overall CPU cores (TCG)
>
> What about "TCG (Overall)"?

Could be confused with the stuff under "Tiny Code Generator (TCG)"
below.

"Overall CPUs (TCG)"?

"TCG CPUs (overall)"?

>>  M: Richard Henderson <rth@twiddle.net>
>>  R: Paolo Bonzini <pbonzini@redhat.com>
>>  S: Maintained
>> @@ -133,14 +133,14 @@ F: fpu/
>>  F: include/fpu/
>>  F: tests/fp/
>>  
>> -Alpha
>> +Alpha CPU cores (TCG)
>
> I find "cores" confusing here, why not use "Alpha CPU (TCG)"?

"Alpha CPUs (TCG)"?

"TCG Alpha CPUs"?

Same for KVM and Xen below.

>>  M: Richard Henderson <rth@twiddle.net>
>>  S: Maintained
>>  F: target/alpha/
>>  F: tests/tcg/alpha/
>>  F: disas/alpha.c
>>  
>> -ARM
>> +ARM CPU cores (TCG)
>
> Ditto.
>
>>  M: Peter Maydell <peter.maydell@linaro.org>
>>  L: qemu-arm@nongnu.org
>>  S: Maintained
>> @@ -161,7 +161,7 @@ S: Maintained
>>  F: hw/arm/smmu*
>>  F: include/hw/arm/smmu*
>>  
>> -CRIS
>> +CRIS CPU cores (TCG)
>>  M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>>  S: Maintained
>>  F: target/cris/
>> @@ -170,14 +170,14 @@ F: include/hw/cris/
>>  F: tests/tcg/cris/
>>  F: disas/cris.c
>>  
>> -HPPA (PA-RISC)
>> +HPPA (PA-RISC) CPU cores (TCG)
>>  M: Richard Henderson <rth@twiddle.net>
>>  S: Maintained
>>  F: target/hppa/
>>  F: hw/hppa/
>>  F: disas/hppa.c
>>  
>> -LM32
>> +LM32 CPU cores (TCG)
>>  M: Michael Walle <michael@walle.cc>
>>  S: Maintained
>>  F: target/lm32/
>> @@ -190,20 +190,20 @@ F: include/hw/char/lm32_juart.h
>>  F: include/hw/lm32/
>>  F: tests/tcg/lm32/
>>  
>> -M68K
>> +M68K CPU cores (TCG)
>>  M: Laurent Vivier <laurent@vivier.eu>
>>  S: Maintained
>>  F: target/m68k/
>>  F: disas/m68k.c
>>  
>> -MicroBlaze
>> +MicroBlaze CPU cores (TCG)
>>  M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>>  S: Maintained
>>  F: target/microblaze/
>>  F: hw/microblaze/
>>  F: disas/microblaze.c
>>  
>> -MIPS
>> +MIPS CPU cores (TCG)
>>  M: Aurelien Jarno <aurelien@aurel32.net>
>>  M: Aleksandar Markovic <amarkovic@wavecomp.com>
>>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>> @@ -224,7 +224,7 @@ F: include/hw/timer/mips_gictimer.h
>>  F: tests/tcg/mips/
>>  K: ^Subject:.*(?i)mips
>>  
>> -Moxie
>> +Moxie CPU cores (TCG)
>>  M: Anthony Green <green@moxielogic.com>
>>  S: Maintained
>>  F: target/moxie/
>> @@ -232,7 +232,7 @@ F: disas/moxie.c
>>  F: hw/moxie/
>>  F: default-configs/moxie-softmmu.mak
>>  
>> -NiosII
>> +NiosII CPU cores (TCG)
>>  M: Chris Wulff <crwulff@gmail.com>
>>  M: Marek Vasut <marex@denx.de>
>>  S: Maintained
>> @@ -242,14 +242,14 @@ F: hw/intc/nios2_iic.c
>>  F: disas/nios2.c
>>  F: default-configs/nios2-softmmu.mak
>>  
>> -OpenRISC
>> +OpenRISC CPU cores (TCG)
>>  M: Stafford Horne <shorne@gmail.com>
>>  S: Odd Fixes
>>  F: target/openrisc/
>>  F: hw/openrisc/
>>  F: tests/tcg/openrisc/
>>  
>> -PowerPC
>> +PowerPC CPU cores (TCG)
>>  M: David Gibson <david@gibson.dropbear.id.au>
>>  L: qemu-ppc@nongnu.org
>>  S: Maintained
>> @@ -258,7 +258,7 @@ F: hw/ppc/
>>  F: include/hw/ppc/
>>  F: disas/ppc.c
>>  
>> -RISC-V
>> +RISC-V CPU cores (TCG)
>>  M: Palmer Dabbelt <palmer@sifive.com>
>>  M: Alistair Francis <Alistair.Francis@wdc.com>
>>  M: Sagar Karandikar <sagark@eecs.berkeley.edu>
>> @@ -271,7 +271,7 @@ F: include/hw/riscv/
>>  F: linux-user/host/riscv32/
>>  F: linux-user/host/riscv64/
>>  
>> -S390
>> +S390 CPU cores (TCG)
>>  M: Richard Henderson <rth@twiddle.net>
>>  M: David Hildenbrand <david@redhat.com>
>>  S: Maintained
>> @@ -281,7 +281,7 @@ F: disas/s390.c
>>  F: tests/tcg/s390x/
>>  L: qemu-s390x@nongnu.org
>>  
>> -SH4
>> +SH4 CPU cores (TCG)
>>  M: Aurelien Jarno <aurelien@aurel32.net>
>>  S: Odd Fixes
>>  F: target/sh4/
>> @@ -289,7 +289,7 @@ F: hw/sh4/
>>  F: disas/sh4.c
>>  F: include/hw/sh4/
>>  
>> -SPARC
>> +SPARC CPU cores (TCG)
>>  M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>>  M: Artyom Tarasenko <atar4qemu@gmail.com>
>>  S: Maintained
>> @@ -299,14 +299,14 @@ F: hw/sparc64/
>>  F: include/hw/sparc/sparc64.h
>>  F: disas/sparc.c
>>  
>> -UniCore32
>> +UniCore32 CPU cores (TCG)
>>  M: Guan Xuetao <gxt@mprc.pku.edu.cn>
>>  S: Maintained
>>  F: target/unicore32/
>>  F: hw/unicore32/
>>  F: include/hw/unicore32/
>>  
>> -X86
>> +X86 CPU cores (TCG)
>>  M: Paolo Bonzini <pbonzini@redhat.com>
>>  M: Richard Henderson <rth@twiddle.net>
>>  M: Eduardo Habkost <ehabkost@redhat.com>
>> @@ -319,7 +319,7 @@ F: disas/i386.c
>>  F: docs/qemu-cpu-models.texi
>>  T: git https://github.com/ehabkost/qemu.git x86-next
>>  
>> -Xtensa
>> +Xtensa CPU cores (TCG)
>>  M: Max Filippov <jcmvbkbc@gmail.com>
>>  W: http://wiki.osll.ru/doku.php?id=etc:users:jcmvbkbc:qemu-target-xtensa
>>  S: Maintained
>> @@ -330,7 +330,7 @@ F: disas/xtensa.c
>>  F: include/hw/xtensa/xtensa-isa.h
>>  F: default-configs/xtensa*.mak
>>  
>> -TriCore
>> +TriCore CPU cores (TCG)
>>  M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
>>  S: Maintained
>>  F: target/tricore/
>> @@ -345,7 +345,7 @@ F: tests/tcg/multiarch/
>>  Guest CPU Cores (KVM):
>>  ----------------------
>>  
>> -Overall
>> +Overall CPU cores (KVM)
>
> "KVM (Overall)"?
>
>>  M: Paolo Bonzini <pbonzini@redhat.com>
>>  L: kvm@vger.kernel.org
>>  S: Supported
>> @@ -356,24 +356,24 @@ F: include/hw/kvm/
>>  F: include/sysemu/kvm*.h
>>  F: scripts/kvm/kvm_flightrecorder
>>  
>> -ARM
>> +ARM CPU cores (KVM)
>
> "ARM CPU (KVM)"?
>
>>  M: Peter Maydell <peter.maydell@linaro.org>
>>  L: qemu-arm@nongnu.org
>>  S: Maintained
>>  F: target/arm/kvm.c
>>  
>> -MIPS
>> +MIPS CPU cores (KVM)
>>  M: James Hogan <jhogan@kernel.org>
>>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>>  S: Maintained
>>  F: target/mips/kvm.c
>>  
>> -PPC
>> +PPC CPU cores (KVM)
>>  M: David Gibson <david@gibson.dropbear.id.au>
>>  S: Maintained
>>  F: target/ppc/kvm.c
>>  
>> -S390
>> +S390 CPU cores (KVM)
>>  M: Halil Pasic <pasic@linux.ibm.com>
>>  M: Cornelia Huck <cohuck@redhat.com>
>>  M: Christian Borntraeger <borntraeger@de.ibm.com>
>> @@ -392,7 +392,7 @@ T: git https://github.com/cohuck/qemu.git s390-next
>>  T: git https://github.com/borntraeger/qemu.git s390-next
>>  L: qemu-s390x@nongnu.org
>>  
>> -X86
>> +X86 CPU cores (KVM)
>>  M: Paolo Bonzini <pbonzini@redhat.com>
>>  M: Marcelo Tosatti <mtosatti@redhat.com>
>>  L: kvm@vger.kernel.org
>> @@ -403,7 +403,7 @@ F: scripts/kvm/vmxcap
>>  Guest CPU Cores (Xen):
>>  ----------------------
>>  
>> -X86
>> +X86 CPU cores (Xen)
>>  M: Stefano Stabellini <sstabellini@kernel.org>
>>  M: Anthony Perard <anthony.perard@citrix.com>
>>  M: Paul Durrant <paul.durrant@citrix.com>
>> @@ -2256,7 +2256,7 @@ F: tests/uefi-test-tools/
>>  
>>  Usermode Emulation
>>  ------------------
>> -Overall
>> +Overall usermode emulation
>
> "Usermode Emulation (Overall)"?

Works for me.

>>  M: Riku Voipio <riku.voipio@iki.fi>
>>  S: Maintained
>>  F: thunk.c
>> @@ -2282,7 +2282,7 @@ M: Richard Henderson <rth@twiddle.net>

Missed one:

    Tiny Code Generator (TCG)
    -------------------------
    Common code

Something like "TCG common code" should do.

    M: Richard Henderson <rth@twiddle.net>
>>  S: Maintained
>>  F: tcg/
>>  
>> -AArch64 target
>> +AArch64 TCG target
>>  M: Claudio Fontana <claudio.fontana@huawei.com>
>>  M: Claudio Fontana <claudio.fontana@gmail.com>
>>  S: Maintained
>> @@ -2291,33 +2291,33 @@ F: tcg/aarch64/
>>  F: disas/arm-a64.cc
>>  F: disas/libvixl/
>>  
>> -ARM target
>> +ARM TCG target
>>  M: Andrzej Zaborowski <balrogg@gmail.com>
>>  S: Maintained
>>  L: qemu-arm@nongnu.org
>>  F: tcg/arm/
>>  F: disas/arm.c
>>  
>> -i386 target
>> +i386 TCG target
>>  M: Richard Henderson <rth@twiddle.net>
>>  S: Maintained
>>  F: tcg/i386/
>>  F: disas/i386.c
>>  
>> -MIPS target
>> +MIPS TCG target
>>  M: Aurelien Jarno <aurelien@aurel32.net>
>>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>>  S: Maintained
>>  F: tcg/mips/
>>  F: disas/mips.c
>>  
>> -PPC
>> +PPC TCG target
>>  M: Richard Henderson <rth@twiddle.net>
>>  S: Odd Fixes
>>  F: tcg/ppc/
>>  F: disas/ppc.c
>>  
>> -RISC-V
>> +RISC-V TCG target
>>  M: Palmer Dabbelt <palmer@sifive.com>
>>  M: Alistair Francis <Alistair.Francis@wdc.com>
>>  L: qemu-riscv@nongnu.org
>> @@ -2325,19 +2325,19 @@ S: Maintained
>>  F: tcg/riscv/
>>  F: disas/riscv.c
>>  
>> -S390 target
>> +S390 TCG target
>>  M: Richard Henderson <rth@twiddle.net>
>>  S: Maintained
>>  F: tcg/s390/
>>  F: disas/s390.c
>>  L: qemu-s390x@nongnu.org
>>  
>> -SPARC target
>> +SPARC TCG target
>>  S: Odd Fixes
>>  F: tcg/sparc/
>>  F: disas/sparc.c
>>  
>> -TCI target
>> +TCI TCG target
>>  M: Stefan Weil <sw@weilnetz.de>
>>  S: Maintained
>>  F: tcg/tci/
>>
Aleksandar Markovic May 30, 2019, 10:40 p.m. UTC | #6
On May 29, 2019 5:09 PM, "Markus Armbruster" <armbru@redhat.com> wrote:
>
> When scripts/get_maintainer.pl reports something like
>
>     John Doe <jdoe@example.org> (maintainer:Overall)
>
> the user is left to wonder *which* of our three "Overall" sections
> applies.  We have three, one each under "Guest CPU cores (TCG)",
> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>
> Rename sections under
>
> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>
> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>
> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>

In its essence definitely not a bad idea, but I must admit I tend to agree
with Philippe the new titles sound confusing, odd, artificial. Perhaps the
better alternative could be:

“FOO TCG guest”
“FOO KVM guest”
“FOO Xen guest”

> * "Architecture support" from "FOO" to "FOO general architecture
>   support"
>

Here we have a kind of strange situation with S390 architecture - it is the
only one present in this way in MAINTAINERS. Othrr than that, your new
wording looks fine to me.

> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>

I think this one you got it right.

Yours,
Aleksandar

>
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>  1 file changed, 39 insertions(+), 39 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index edc260e503..196282d165 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -83,7 +83,7 @@ T: git https://github.com/vivier/qemu.git
trivial-patches
>
>  Architecture support
>  --------------------
> -S390
> +S390 general architecture support
>  M: Cornelia Huck <cohuck@redhat.com>
>  S: Supported
>  F: default-configs/s390x-softmmu.mak
> @@ -108,7 +108,7 @@ L: qemu-s390x@nongnu.org
>
>  Guest CPU cores (TCG):
>  ----------------------
> -Overall
> +Overall CPU cores (TCG)
>  M: Richard Henderson <rth@twiddle.net>
>  R: Paolo Bonzini <pbonzini@redhat.com>
>  S: Maintained
> @@ -133,14 +133,14 @@ F: fpu/
>  F: include/fpu/
>  F: tests/fp/
>
> -Alpha
> +Alpha CPU cores (TCG)
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: target/alpha/
>  F: tests/tcg/alpha/
>  F: disas/alpha.c
>
> -ARM
> +ARM CPU cores (TCG)
>  M: Peter Maydell <peter.maydell@linaro.org>
>  L: qemu-arm@nongnu.org
>  S: Maintained
> @@ -161,7 +161,7 @@ S: Maintained
>  F: hw/arm/smmu*
>  F: include/hw/arm/smmu*
>
> -CRIS
> +CRIS CPU cores (TCG)
>  M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>  S: Maintained
>  F: target/cris/
> @@ -170,14 +170,14 @@ F: include/hw/cris/
>  F: tests/tcg/cris/
>  F: disas/cris.c
>
> -HPPA (PA-RISC)
> +HPPA (PA-RISC) CPU cores (TCG)
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: target/hppa/
>  F: hw/hppa/
>  F: disas/hppa.c
>
> -LM32
> +LM32 CPU cores (TCG)
>  M: Michael Walle <michael@walle.cc>
>  S: Maintained
>  F: target/lm32/
> @@ -190,20 +190,20 @@ F: include/hw/char/lm32_juart.h
>  F: include/hw/lm32/
>  F: tests/tcg/lm32/
>
> -M68K
> +M68K CPU cores (TCG)
>  M: Laurent Vivier <laurent@vivier.eu>
>  S: Maintained
>  F: target/m68k/
>  F: disas/m68k.c
>
> -MicroBlaze
> +MicroBlaze CPU cores (TCG)
>  M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>  S: Maintained
>  F: target/microblaze/
>  F: hw/microblaze/
>  F: disas/microblaze.c
>
> -MIPS
> +MIPS CPU cores (TCG)
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  M: Aleksandar Markovic <amarkovic@wavecomp.com>
>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
> @@ -224,7 +224,7 @@ F: include/hw/timer/mips_gictimer.h
>  F: tests/tcg/mips/
>  K: ^Subject:.*(?i)mips
>
> -Moxie
> +Moxie CPU cores (TCG)
>  M: Anthony Green <green@moxielogic.com>
>  S: Maintained
>  F: target/moxie/
> @@ -232,7 +232,7 @@ F: disas/moxie.c
>  F: hw/moxie/
>  F: default-configs/moxie-softmmu.mak
>
> -NiosII
> +NiosII CPU cores (TCG)
>  M: Chris Wulff <crwulff@gmail.com>
>  M: Marek Vasut <marex@denx.de>
>  S: Maintained
> @@ -242,14 +242,14 @@ F: hw/intc/nios2_iic.c
>  F: disas/nios2.c
>  F: default-configs/nios2-softmmu.mak
>
> -OpenRISC
> +OpenRISC CPU cores (TCG)
>  M: Stafford Horne <shorne@gmail.com>
>  S: Odd Fixes
>  F: target/openrisc/
>  F: hw/openrisc/
>  F: tests/tcg/openrisc/
>
> -PowerPC
> +PowerPC CPU cores (TCG)
>  M: David Gibson <david@gibson.dropbear.id.au>
>  L: qemu-ppc@nongnu.org
>  S: Maintained
> @@ -258,7 +258,7 @@ F: hw/ppc/
>  F: include/hw/ppc/
>  F: disas/ppc.c
>
> -RISC-V
> +RISC-V CPU cores (TCG)
>  M: Palmer Dabbelt <palmer@sifive.com>
>  M: Alistair Francis <Alistair.Francis@wdc.com>
>  M: Sagar Karandikar <sagark@eecs.berkeley.edu>
> @@ -271,7 +271,7 @@ F: include/hw/riscv/
>  F: linux-user/host/riscv32/
>  F: linux-user/host/riscv64/
>
> -S390
> +S390 CPU cores (TCG)
>  M: Richard Henderson <rth@twiddle.net>
>  M: David Hildenbrand <david@redhat.com>
>  S: Maintained
> @@ -281,7 +281,7 @@ F: disas/s390.c
>  F: tests/tcg/s390x/
>  L: qemu-s390x@nongnu.org
>
> -SH4
> +SH4 CPU cores (TCG)
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  S: Odd Fixes
>  F: target/sh4/
> @@ -289,7 +289,7 @@ F: hw/sh4/
>  F: disas/sh4.c
>  F: include/hw/sh4/
>
> -SPARC
> +SPARC CPU cores (TCG)
>  M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>  M: Artyom Tarasenko <atar4qemu@gmail.com>
>  S: Maintained
> @@ -299,14 +299,14 @@ F: hw/sparc64/
>  F: include/hw/sparc/sparc64.h
>  F: disas/sparc.c
>
> -UniCore32
> +UniCore32 CPU cores (TCG)
>  M: Guan Xuetao <gxt@mprc.pku.edu.cn>
>  S: Maintained
>  F: target/unicore32/
>  F: hw/unicore32/
>  F: include/hw/unicore32/
>
> -X86
> +X86 CPU cores (TCG)
>  M: Paolo Bonzini <pbonzini@redhat.com>
>  M: Richard Henderson <rth@twiddle.net>
>  M: Eduardo Habkost <ehabkost@redhat.com>
> @@ -319,7 +319,7 @@ F: disas/i386.c
>  F: docs/qemu-cpu-models.texi
>  T: git https://github.com/ehabkost/qemu.git x86-next
>
> -Xtensa
> +Xtensa CPU cores (TCG)
>  M: Max Filippov <jcmvbkbc@gmail.com>
>  W: http://wiki.osll.ru/doku.php?id=etc:users:jcmvbkbc:qemu-target-xtensa
>  S: Maintained
> @@ -330,7 +330,7 @@ F: disas/xtensa.c
>  F: include/hw/xtensa/xtensa-isa.h
>  F: default-configs/xtensa*.mak
>
> -TriCore
> +TriCore CPU cores (TCG)
>  M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
>  S: Maintained
>  F: target/tricore/
> @@ -345,7 +345,7 @@ F: tests/tcg/multiarch/
>  Guest CPU Cores (KVM):
>  ----------------------
>
> -Overall
> +Overall CPU cores (KVM)
>  M: Paolo Bonzini <pbonzini@redhat.com>
>  L: kvm@vger.kernel.org
>  S: Supported
> @@ -356,24 +356,24 @@ F: include/hw/kvm/
>  F: include/sysemu/kvm*.h
>  F: scripts/kvm/kvm_flightrecorder
>
> -ARM
> +ARM CPU cores (KVM)
>  M: Peter Maydell <peter.maydell@linaro.org>
>  L: qemu-arm@nongnu.org
>  S: Maintained
>  F: target/arm/kvm.c
>
> -MIPS
> +MIPS CPU cores (KVM)
>  M: James Hogan <jhogan@kernel.org>
>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>  S: Maintained
>  F: target/mips/kvm.c
>
> -PPC
> +PPC CPU cores (KVM)
>  M: David Gibson <david@gibson.dropbear.id.au>
>  S: Maintained
>  F: target/ppc/kvm.c
>
> -S390
> +S390 CPU cores (KVM)
>  M: Halil Pasic <pasic@linux.ibm.com>
>  M: Cornelia Huck <cohuck@redhat.com>
>  M: Christian Borntraeger <borntraeger@de.ibm.com>
> @@ -392,7 +392,7 @@ T: git https://github.com/cohuck/qemu.git s390-next
>  T: git https://github.com/borntraeger/qemu.git s390-next
>  L: qemu-s390x@nongnu.org
>
> -X86
> +X86 CPU cores (KVM)
>  M: Paolo Bonzini <pbonzini@redhat.com>
>  M: Marcelo Tosatti <mtosatti@redhat.com>
>  L: kvm@vger.kernel.org
> @@ -403,7 +403,7 @@ F: scripts/kvm/vmxcap
>  Guest CPU Cores (Xen):
>  ----------------------
>
> -X86
> +X86 CPU cores (Xen)
>  M: Stefano Stabellini <sstabellini@kernel.org>
>  M: Anthony Perard <anthony.perard@citrix.com>
>  M: Paul Durrant <paul.durrant@citrix.com>
> @@ -2256,7 +2256,7 @@ F: tests/uefi-test-tools/
>
>  Usermode Emulation
>  ------------------
> -Overall
> +Overall usermode emulation
>  M: Riku Voipio <riku.voipio@iki.fi>
>  S: Maintained
>  F: thunk.c
> @@ -2282,7 +2282,7 @@ M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: tcg/
>
> -AArch64 target
> +AArch64 TCG target
>  M: Claudio Fontana <claudio.fontana@huawei.com>
>  M: Claudio Fontana <claudio.fontana@gmail.com>
>  S: Maintained
> @@ -2291,33 +2291,33 @@ F: tcg/aarch64/
>  F: disas/arm-a64.cc
>  F: disas/libvixl/
>
> -ARM target
> +ARM TCG target
>  M: Andrzej Zaborowski <balrogg@gmail.com>
>  S: Maintained
>  L: qemu-arm@nongnu.org
>  F: tcg/arm/
>  F: disas/arm.c
>
> -i386 target
> +i386 TCG target
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: tcg/i386/
>  F: disas/i386.c
>
> -MIPS target
> +MIPS TCG target
>  M: Aurelien Jarno <aurelien@aurel32.net>
>  R: Aleksandar Rikalo <arikalo@wavecomp.com>
>  S: Maintained
>  F: tcg/mips/
>  F: disas/mips.c
>
> -PPC
> +PPC TCG target
>  M: Richard Henderson <rth@twiddle.net>
>  S: Odd Fixes
>  F: tcg/ppc/
>  F: disas/ppc.c
>
> -RISC-V
> +RISC-V TCG target
>  M: Palmer Dabbelt <palmer@sifive.com>
>  M: Alistair Francis <Alistair.Francis@wdc.com>
>  L: qemu-riscv@nongnu.org
> @@ -2325,19 +2325,19 @@ S: Maintained
>  F: tcg/riscv/
>  F: disas/riscv.c
>
> -S390 target
> +S390 TCG target
>  M: Richard Henderson <rth@twiddle.net>
>  S: Maintained
>  F: tcg/s390/
>  F: disas/s390.c
>  L: qemu-s390x@nongnu.org
>
> -SPARC target
> +SPARC TCG target
>  S: Odd Fixes
>  F: tcg/sparc/
>  F: disas/sparc.c
>
> -TCI target
> +TCI TCG target
>  M: Stefan Weil <sw@weilnetz.de>
>  S: Maintained
>  F: tcg/tci/
> --
> 2.17.2
>
>
Stafford Horne May 31, 2019, 3:36 a.m. UTC | #7
On Wed, May 29, 2019 at 05:08:52PM +0200, Markus Armbruster wrote:
> When scripts/get_maintainer.pl reports something like
> 
>     John Doe <jdoe@example.org> (maintainer:Overall)
> 
> the user is left to wonder *which* of our three "Overall" sections
> applies.  We have three, one each under "Guest CPU cores (TCG)",
> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
> 
> Rename sections under
> 
> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
> 
> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
> 
> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
> 
> * "Architecture support" from "FOO" to "FOO general architecture
>   support"
> 
> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
> 
> While there,
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>  1 file changed, 39 insertions(+), 39 deletions(-)

... 

> -OpenRISC
> +OpenRISC CPU cores (TCG)
>  M: Stafford Horne <shorne@gmail.com>
>  S: Odd Fixes
>  F: target/openrisc/
>  F: hw/openrisc/
>  F: tests/tcg/openrisc/
>  

As directories listed there I look over both target/ (TCG?) and hw/.
Would it be better to be 'OpenRISC general architecture'?

-Stafford
Markus Armbruster June 3, 2019, 8:29 a.m. UTC | #8
Aleksandar Markovic <aleksandar.m.mail@gmail.com> writes:

> On May 29, 2019 5:09 PM, "Markus Armbruster" <armbru@redhat.com> wrote:
>>
>> When scripts/get_maintainer.pl reports something like
>>
>>     John Doe <jdoe@example.org> (maintainer:Overall)
>>
>> the user is left to wonder *which* of our three "Overall" sections
>> applies.  We have three, one each under "Guest CPU cores (TCG)",
>> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>>
>> Rename sections under
>>
>> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>>
>> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>>
>> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>>
>
> In its essence definitely not a bad idea, but I must admit I tend to agree
> with Philippe the new titles sound confusing, odd, artificial. Perhaps the
> better alternative could be:
>
> “FOO TCG guest”
> “FOO KVM guest”
> “FOO Xen guest”

Other suggestions mentioned so far:

  "FOO CPUs (TCG)"
  "TCG FOO CPUs"

and same for KVM and Xen.

I guess mentioning target first, accelerator second, no parenthesis
makes sense.  That leaves "guest" vs. "CPUs".  Which one's closer to the
truth?

>> * "Architecture support" from "FOO" to "FOO general architecture
>>   support"
>>
>
> Here we have a kind of strange situation with S390 architecture - it is the
> only one present in this way in MAINTAINERS. Othrr than that, your new
> wording looks fine to me.

Yes, it's odd.  But it's what works for the S390 maintainers.

>> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>>
>
> I think this one you got it right.

Thanks!
Markus Armbruster June 3, 2019, 8:32 a.m. UTC | #9
Stafford Horne <shorne@gmail.com> writes:

> On Wed, May 29, 2019 at 05:08:52PM +0200, Markus Armbruster wrote:
>> When scripts/get_maintainer.pl reports something like
>> 
>>     John Doe <jdoe@example.org> (maintainer:Overall)
>> 
>> the user is left to wonder *which* of our three "Overall" sections
>> applies.  We have three, one each under "Guest CPU cores (TCG)",
>> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>> 
>> Rename sections under
>> 
>> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>> 
>> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>> 
>> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>> 
>> * "Architecture support" from "FOO" to "FOO general architecture
>>   support"
>> 
>> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>> 
>> While there,
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>>  1 file changed, 39 insertions(+), 39 deletions(-)
>
> ... 
>
>> -OpenRISC
>> +OpenRISC CPU cores (TCG)
>>  M: Stafford Horne <shorne@gmail.com>
>>  S: Odd Fixes
>>  F: target/openrisc/
>>  F: hw/openrisc/
>>  F: tests/tcg/openrisc/
>>  
>
> As directories listed there I look over both target/ (TCG?) and hw/.

Same for ARM, LM32, MicroBlaze, MIPS, Moxie, ...

> Would it be better to be 'OpenRISC general architecture'?

Valid question.  Peter, do you have an opinion?
Philippe Mathieu-Daudé June 3, 2019, 8:45 a.m. UTC | #10
On 5/31/19 5:36 AM, Stafford Horne wrote:
> On Wed, May 29, 2019 at 05:08:52PM +0200, Markus Armbruster wrote:
>> When scripts/get_maintainer.pl reports something like
>>
>>     John Doe <jdoe@example.org> (maintainer:Overall)
>>
>> the user is left to wonder *which* of our three "Overall" sections
>> applies.  We have three, one each under "Guest CPU cores (TCG)",
>> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>>
>> Rename sections under
>>
>> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>>
>> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>>
>> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>>
>> * "Architecture support" from "FOO" to "FOO general architecture
>>   support"
>>
>> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>>
>> While there,
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>>  1 file changed, 39 insertions(+), 39 deletions(-)
> 
> ... 
> 
>> -OpenRISC
>> +OpenRISC CPU cores (TCG)
>>  M: Stafford Horne <shorne@gmail.com>
>>  S: Odd Fixes
>>  F: target/openrisc/
>>  F: hw/openrisc/
>>  F: tests/tcg/openrisc/
>>  
> 
> As directories listed there I look over both target/ (TCG?) and hw/.
> Would it be better to be 'OpenRISC general architecture'?

There is a historical separation between target/ and hw/ because they
cover different concepts, and have different maintainers/reviewers.

- target/$arch/ is for TCG/KVM
- hw/ is for machines and their devices
  (some devices are reused by multiple archs)

Although the separation is not always clear (some devices are tied to an
architecture, some architecture instruction directly access devices) I'd
prefer we keep 2 distincts MAINTAINERS sections (keeping you maintainer
of both). This will ease developper with specific background/interests
to volunteer to a particular section.

Regards,

Phil.
Cornelia Huck June 3, 2019, 9:35 a.m. UTC | #11
On Mon, 03 Jun 2019 10:29:35 +0200
Markus Armbruster <armbru@redhat.com> wrote:

> Aleksandar Markovic <aleksandar.m.mail@gmail.com> writes:
> 
> > On May 29, 2019 5:09 PM, "Markus Armbruster" <armbru@redhat.com> wrote:  
> >>
> >> When scripts/get_maintainer.pl reports something like
> >>
> >>     John Doe <jdoe@example.org> (maintainer:Overall)
> >>
> >> the user is left to wonder *which* of our three "Overall" sections
> >> applies.  We have three, one each under "Guest CPU cores (TCG)",
> >> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
> >>
> >> Rename sections under
> >>
> >> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
> >>
> >> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
> >>
> >> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
> >>  
> >
> > In its essence definitely not a bad idea, but I must admit I tend to agree
> > with Philippe the new titles sound confusing, odd, artificial. Perhaps the
> > better alternative could be:
> >
> > “FOO TCG guest”
> > “FOO KVM guest”
> > “FOO Xen guest”  
> 
> Other suggestions mentioned so far:
> 
>   "FOO CPUs (TCG)"
>   "TCG FOO CPUs"
> 
> and same for KVM and Xen.
> 
> I guess mentioning target first, accelerator second, no parenthesis
> makes sense.  That leaves "guest" vs. "CPUs".  Which one's closer to the
> truth?

'CPUs' makes more sense to me; 'guest' would also include
(architecture-specific) emulated devices.

> 
> >> * "Architecture support" from "FOO" to "FOO general architecture
> >>   support"
> >>  
> >
> > Here we have a kind of strange situation with S390 architecture - it is the
> > only one present in this way in MAINTAINERS. Othrr than that, your new
> > wording looks fine to me.  
> 
> Yes, it's odd.  But it's what works for the S390 maintainers.

Yes. I basically integrate all s390 stuff, including pull requests from
others. I'm more wondering why other architectures don't do that as
well :) Different setup, I guess.
Stafford Horne June 4, 2019, 10:33 a.m. UTC | #12
On Mon, Jun 03, 2019 at 10:45:14AM +0200, Philippe Mathieu-Daudé wrote:
> On 5/31/19 5:36 AM, Stafford Horne wrote:
> > On Wed, May 29, 2019 at 05:08:52PM +0200, Markus Armbruster wrote:
> >> When scripts/get_maintainer.pl reports something like
> >>
> >>     John Doe <jdoe@example.org> (maintainer:Overall)
> >>
> >> the user is left to wonder *which* of our three "Overall" sections
> >> applies.  We have three, one each under "Guest CPU cores (TCG)",
> >> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
> >>
> >> Rename sections under
> >>
> >> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
> >>
> >> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
> >>
> >> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
> >>
> >> * "Architecture support" from "FOO" to "FOO general architecture
> >>   support"
> >>
> >> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
> >>
> >> While there,
> >>
> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> >> ---
> >>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
> >>  1 file changed, 39 insertions(+), 39 deletions(-)
> > 
> > ... 
> > 
> >> -OpenRISC
> >> +OpenRISC CPU cores (TCG)
> >>  M: Stafford Horne <shorne@gmail.com>
> >>  S: Odd Fixes
> >>  F: target/openrisc/
> >>  F: hw/openrisc/
> >>  F: tests/tcg/openrisc/
> >>  
> > 
> > As directories listed there I look over both target/ (TCG?) and hw/.
> > Would it be better to be 'OpenRISC general architecture'?
> 
> There is a historical separation between target/ and hw/ because they
> cover different concepts, and have different maintainers/reviewers.
> 
> - target/$arch/ is for TCG/KVM
> - hw/ is for machines and their devices
>   (some devices are reused by multiple archs)
> 
> Although the separation is not always clear (some devices are tied to an
> architecture, some architecture instruction directly access devices) I'd
> prefer we keep 2 distincts MAINTAINERS sections (keeping you maintainer
> of both). This will ease developper with specific background/interests
> to volunteer to a particular section.

Hello,

Thanks for the explaination.  I think it makes sense to have 2 different
maintainer sections.  In that case should this patch be amended to move the
'F: hw/openrisc/' etc out to a different section with the different header?

-Stafford
Markus Armbruster June 6, 2019, 5:01 p.m. UTC | #13
Stafford Horne <shorne@gmail.com> writes:

> On Mon, Jun 03, 2019 at 10:45:14AM +0200, Philippe Mathieu-Daudé wrote:
>> On 5/31/19 5:36 AM, Stafford Horne wrote:
>> > On Wed, May 29, 2019 at 05:08:52PM +0200, Markus Armbruster wrote:
>> >> When scripts/get_maintainer.pl reports something like
>> >>
>> >>     John Doe <jdoe@example.org> (maintainer:Overall)
>> >>
>> >> the user is left to wonder *which* of our three "Overall" sections
>> >> applies.  We have three, one each under "Guest CPU cores (TCG)",
>> >> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>> >>
>> >> Rename sections under
>> >>
>> >> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>> >>
>> >> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>> >>
>> >> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>> >>
>> >> * "Architecture support" from "FOO" to "FOO general architecture
>> >>   support"
>> >>
>> >> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>> >>
>> >> While there,
>> >>
>> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> >> ---
>> >>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>> >>  1 file changed, 39 insertions(+), 39 deletions(-)
>> > 
>> > ... 
>> > 
>> >> -OpenRISC
>> >> +OpenRISC CPU cores (TCG)
>> >>  M: Stafford Horne <shorne@gmail.com>
>> >>  S: Odd Fixes
>> >>  F: target/openrisc/
>> >>  F: hw/openrisc/
>> >>  F: tests/tcg/openrisc/
>> >>  
>> > 
>> > As directories listed there I look over both target/ (TCG?) and hw/.
>> > Would it be better to be 'OpenRISC general architecture'?
>> 
>> There is a historical separation between target/ and hw/ because they
>> cover different concepts, and have different maintainers/reviewers.
>> 
>> - target/$arch/ is for TCG/KVM
>> - hw/ is for machines and their devices
>>   (some devices are reused by multiple archs)
>> 
>> Although the separation is not always clear (some devices are tied to an
>> architecture, some architecture instruction directly access devices) I'd
>> prefer we keep 2 distincts MAINTAINERS sections (keeping you maintainer
>> of both). This will ease developper with specific background/interests
>> to volunteer to a particular section.
>
> Hello,
>
> Thanks for the explaination.  I think it makes sense to have 2 different
> maintainer sections.  In that case should this patch be amended to move the
> 'F: hw/openrisc/' etc out to a different section with the different header?

This patch merely improves headlines.  Splitting up the OpenRISC section
above should be separate.  Care to send the patch?
Stafford Horne June 6, 2019, 8:56 p.m. UTC | #14
On Thu, Jun 06, 2019 at 07:01:49PM +0200, Markus Armbruster wrote:
>Stafford Horne <shorne@gmail.com> writes:
>
>> On Mon, Jun 03, 2019 at 10:45:14AM +0200, Philippe Mathieu-Daudé wrote:
>>> On 5/31/19 5:36 AM, Stafford Horne wrote:
>>> > On Wed, May 29, 2019 at 05:08:52PM +0200, Markus Armbruster wrote:
>>> >> When scripts/get_maintainer.pl reports something like
>>> >>
>>> >>     John Doe <jdoe@example.org> (maintainer:Overall)
>>> >>
>>> >> the user is left to wonder *which* of our three "Overall" sections
>>> >> applies.  We have three, one each under "Guest CPU cores (TCG)",
>>> >> "Guest CPU Cores (KVM)", and "Overall usermode emulation".
>>> >>
>>> >> Rename sections under
>>> >>
>>> >> * "Guest CPU cores (TCG)" from "FOO" to "FOO CPU cores (TCG)"
>>> >>
>>> >> * "Guest CPU Cores (KVM)" from "FOO" to "FOO CPU cores (KVM)"
>>> >>
>>> >> * "Guest CPU Cores (Xen)" from "FOO" to "FOO CPU cores (Xen)"
>>> >>
>>> >> * "Architecture support" from "FOO" to "FOO general architecture
>>> >>   support"
>>> >>
>>> >> * "Tiny Code Generator (TCG)" from "FOO target" to "FOO TCG target"
>>> >>
>>> >> While there,
>>> >>
>>> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>> >> ---
>>> >>  MAINTAINERS | 78 ++++++++++++++++++++++++++---------------------------
>>> >>  1 file changed, 39 insertions(+), 39 deletions(-)
>>> >
>>> > ...
>>> >
>>> >> -OpenRISC
>>> >> +OpenRISC CPU cores (TCG)
>>> >>  M: Stafford Horne <shorne@gmail.com>
>>> >>  S: Odd Fixes
>>> >>  F: target/openrisc/
>>> >>  F: hw/openrisc/
>>> >>  F: tests/tcg/openrisc/
>>> >>
>>> >
>>> > As directories listed there I look over both target/ (TCG?) and hw/.
>>> > Would it be better to be 'OpenRISC general architecture'?
>>>
>>> There is a historical separation between target/ and hw/ because they
>>> cover different concepts, and have different maintainers/reviewers.
>>>
>>> - target/$arch/ is for TCG/KVM
>>> - hw/ is for machines and their devices
>>>   (some devices are reused by multiple archs)
>>>
>>> Although the separation is not always clear (some devices are tied to an
>>> architecture, some architecture instruction directly access devices) I'd
>>> prefer we keep 2 distincts MAINTAINERS sections (keeping you maintainer
>>> of both). This will ease developper with specific background/interests
>>> to volunteer to a particular section.
>>
>> Hello,
>>
>> Thanks for the explaination.  I think it makes sense to have 2 different
>> maintainer sections.  In that case should this patch be amended to move the
>> 'F: hw/openrisc/' etc out to a different section with the different header?
>
>This patch merely improves headlines.  Splitting up the OpenRISC section
>above should be separate.  Care to send the patch?

Sure, now that I look at it, there is a section for 'OpenRISC Machines' and the
maintainer is out of date.

-Stafford
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index edc260e503..196282d165 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -83,7 +83,7 @@  T: git https://github.com/vivier/qemu.git trivial-patches
 
 Architecture support
 --------------------
-S390
+S390 general architecture support
 M: Cornelia Huck <cohuck@redhat.com>
 S: Supported
 F: default-configs/s390x-softmmu.mak
@@ -108,7 +108,7 @@  L: qemu-s390x@nongnu.org
 
 Guest CPU cores (TCG):
 ----------------------
-Overall
+Overall CPU cores (TCG)
 M: Richard Henderson <rth@twiddle.net>
 R: Paolo Bonzini <pbonzini@redhat.com>
 S: Maintained
@@ -133,14 +133,14 @@  F: fpu/
 F: include/fpu/
 F: tests/fp/
 
-Alpha
+Alpha CPU cores (TCG)
 M: Richard Henderson <rth@twiddle.net>
 S: Maintained
 F: target/alpha/
 F: tests/tcg/alpha/
 F: disas/alpha.c
 
-ARM
+ARM CPU cores (TCG)
 M: Peter Maydell <peter.maydell@linaro.org>
 L: qemu-arm@nongnu.org
 S: Maintained
@@ -161,7 +161,7 @@  S: Maintained
 F: hw/arm/smmu*
 F: include/hw/arm/smmu*
 
-CRIS
+CRIS CPU cores (TCG)
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 S: Maintained
 F: target/cris/
@@ -170,14 +170,14 @@  F: include/hw/cris/
 F: tests/tcg/cris/
 F: disas/cris.c
 
-HPPA (PA-RISC)
+HPPA (PA-RISC) CPU cores (TCG)
 M: Richard Henderson <rth@twiddle.net>
 S: Maintained
 F: target/hppa/
 F: hw/hppa/
 F: disas/hppa.c
 
-LM32
+LM32 CPU cores (TCG)
 M: Michael Walle <michael@walle.cc>
 S: Maintained
 F: target/lm32/
@@ -190,20 +190,20 @@  F: include/hw/char/lm32_juart.h
 F: include/hw/lm32/
 F: tests/tcg/lm32/
 
-M68K
+M68K CPU cores (TCG)
 M: Laurent Vivier <laurent@vivier.eu>
 S: Maintained
 F: target/m68k/
 F: disas/m68k.c
 
-MicroBlaze
+MicroBlaze CPU cores (TCG)
 M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 S: Maintained
 F: target/microblaze/
 F: hw/microblaze/
 F: disas/microblaze.c
 
-MIPS
+MIPS CPU cores (TCG)
 M: Aurelien Jarno <aurelien@aurel32.net>
 M: Aleksandar Markovic <amarkovic@wavecomp.com>
 R: Aleksandar Rikalo <arikalo@wavecomp.com>
@@ -224,7 +224,7 @@  F: include/hw/timer/mips_gictimer.h
 F: tests/tcg/mips/
 K: ^Subject:.*(?i)mips
 
-Moxie
+Moxie CPU cores (TCG)
 M: Anthony Green <green@moxielogic.com>
 S: Maintained
 F: target/moxie/
@@ -232,7 +232,7 @@  F: disas/moxie.c
 F: hw/moxie/
 F: default-configs/moxie-softmmu.mak
 
-NiosII
+NiosII CPU cores (TCG)
 M: Chris Wulff <crwulff@gmail.com>
 M: Marek Vasut <marex@denx.de>
 S: Maintained
@@ -242,14 +242,14 @@  F: hw/intc/nios2_iic.c
 F: disas/nios2.c
 F: default-configs/nios2-softmmu.mak
 
-OpenRISC
+OpenRISC CPU cores (TCG)
 M: Stafford Horne <shorne@gmail.com>
 S: Odd Fixes
 F: target/openrisc/
 F: hw/openrisc/
 F: tests/tcg/openrisc/
 
-PowerPC
+PowerPC CPU cores (TCG)
 M: David Gibson <david@gibson.dropbear.id.au>
 L: qemu-ppc@nongnu.org
 S: Maintained
@@ -258,7 +258,7 @@  F: hw/ppc/
 F: include/hw/ppc/
 F: disas/ppc.c
 
-RISC-V
+RISC-V CPU cores (TCG)
 M: Palmer Dabbelt <palmer@sifive.com>
 M: Alistair Francis <Alistair.Francis@wdc.com>
 M: Sagar Karandikar <sagark@eecs.berkeley.edu>
@@ -271,7 +271,7 @@  F: include/hw/riscv/
 F: linux-user/host/riscv32/
 F: linux-user/host/riscv64/
 
-S390
+S390 CPU cores (TCG)
 M: Richard Henderson <rth@twiddle.net>
 M: David Hildenbrand <david@redhat.com>
 S: Maintained
@@ -281,7 +281,7 @@  F: disas/s390.c
 F: tests/tcg/s390x/
 L: qemu-s390x@nongnu.org
 
-SH4
+SH4 CPU cores (TCG)
 M: Aurelien Jarno <aurelien@aurel32.net>
 S: Odd Fixes
 F: target/sh4/
@@ -289,7 +289,7 @@  F: hw/sh4/
 F: disas/sh4.c
 F: include/hw/sh4/
 
-SPARC
+SPARC CPU cores (TCG)
 M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 M: Artyom Tarasenko <atar4qemu@gmail.com>
 S: Maintained
@@ -299,14 +299,14 @@  F: hw/sparc64/
 F: include/hw/sparc/sparc64.h
 F: disas/sparc.c
 
-UniCore32
+UniCore32 CPU cores (TCG)
 M: Guan Xuetao <gxt@mprc.pku.edu.cn>
 S: Maintained
 F: target/unicore32/
 F: hw/unicore32/
 F: include/hw/unicore32/
 
-X86
+X86 CPU cores (TCG)
 M: Paolo Bonzini <pbonzini@redhat.com>
 M: Richard Henderson <rth@twiddle.net>
 M: Eduardo Habkost <ehabkost@redhat.com>
@@ -319,7 +319,7 @@  F: disas/i386.c
 F: docs/qemu-cpu-models.texi
 T: git https://github.com/ehabkost/qemu.git x86-next
 
-Xtensa
+Xtensa CPU cores (TCG)
 M: Max Filippov <jcmvbkbc@gmail.com>
 W: http://wiki.osll.ru/doku.php?id=etc:users:jcmvbkbc:qemu-target-xtensa
 S: Maintained
@@ -330,7 +330,7 @@  F: disas/xtensa.c
 F: include/hw/xtensa/xtensa-isa.h
 F: default-configs/xtensa*.mak
 
-TriCore
+TriCore CPU cores (TCG)
 M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
 S: Maintained
 F: target/tricore/
@@ -345,7 +345,7 @@  F: tests/tcg/multiarch/
 Guest CPU Cores (KVM):
 ----------------------
 
-Overall
+Overall CPU cores (KVM)
 M: Paolo Bonzini <pbonzini@redhat.com>
 L: kvm@vger.kernel.org
 S: Supported
@@ -356,24 +356,24 @@  F: include/hw/kvm/
 F: include/sysemu/kvm*.h
 F: scripts/kvm/kvm_flightrecorder
 
-ARM
+ARM CPU cores (KVM)
 M: Peter Maydell <peter.maydell@linaro.org>
 L: qemu-arm@nongnu.org
 S: Maintained
 F: target/arm/kvm.c
 
-MIPS
+MIPS CPU cores (KVM)
 M: James Hogan <jhogan@kernel.org>
 R: Aleksandar Rikalo <arikalo@wavecomp.com>
 S: Maintained
 F: target/mips/kvm.c
 
-PPC
+PPC CPU cores (KVM)
 M: David Gibson <david@gibson.dropbear.id.au>
 S: Maintained
 F: target/ppc/kvm.c
 
-S390
+S390 CPU cores (KVM)
 M: Halil Pasic <pasic@linux.ibm.com>
 M: Cornelia Huck <cohuck@redhat.com>
 M: Christian Borntraeger <borntraeger@de.ibm.com>
@@ -392,7 +392,7 @@  T: git https://github.com/cohuck/qemu.git s390-next
 T: git https://github.com/borntraeger/qemu.git s390-next
 L: qemu-s390x@nongnu.org
 
-X86
+X86 CPU cores (KVM)
 M: Paolo Bonzini <pbonzini@redhat.com>
 M: Marcelo Tosatti <mtosatti@redhat.com>
 L: kvm@vger.kernel.org
@@ -403,7 +403,7 @@  F: scripts/kvm/vmxcap
 Guest CPU Cores (Xen):
 ----------------------
 
-X86
+X86 CPU cores (Xen)
 M: Stefano Stabellini <sstabellini@kernel.org>
 M: Anthony Perard <anthony.perard@citrix.com>
 M: Paul Durrant <paul.durrant@citrix.com>
@@ -2256,7 +2256,7 @@  F: tests/uefi-test-tools/
 
 Usermode Emulation
 ------------------
-Overall
+Overall usermode emulation
 M: Riku Voipio <riku.voipio@iki.fi>
 S: Maintained
 F: thunk.c
@@ -2282,7 +2282,7 @@  M: Richard Henderson <rth@twiddle.net>
 S: Maintained
 F: tcg/
 
-AArch64 target
+AArch64 TCG target
 M: Claudio Fontana <claudio.fontana@huawei.com>
 M: Claudio Fontana <claudio.fontana@gmail.com>
 S: Maintained
@@ -2291,33 +2291,33 @@  F: tcg/aarch64/
 F: disas/arm-a64.cc
 F: disas/libvixl/
 
-ARM target
+ARM TCG target
 M: Andrzej Zaborowski <balrogg@gmail.com>
 S: Maintained
 L: qemu-arm@nongnu.org
 F: tcg/arm/
 F: disas/arm.c
 
-i386 target
+i386 TCG target
 M: Richard Henderson <rth@twiddle.net>
 S: Maintained
 F: tcg/i386/
 F: disas/i386.c
 
-MIPS target
+MIPS TCG target
 M: Aurelien Jarno <aurelien@aurel32.net>
 R: Aleksandar Rikalo <arikalo@wavecomp.com>
 S: Maintained
 F: tcg/mips/
 F: disas/mips.c
 
-PPC
+PPC TCG target
 M: Richard Henderson <rth@twiddle.net>
 S: Odd Fixes
 F: tcg/ppc/
 F: disas/ppc.c
 
-RISC-V
+RISC-V TCG target
 M: Palmer Dabbelt <palmer@sifive.com>
 M: Alistair Francis <Alistair.Francis@wdc.com>
 L: qemu-riscv@nongnu.org
@@ -2325,19 +2325,19 @@  S: Maintained
 F: tcg/riscv/
 F: disas/riscv.c
 
-S390 target
+S390 TCG target
 M: Richard Henderson <rth@twiddle.net>
 S: Maintained
 F: tcg/s390/
 F: disas/s390.c
 L: qemu-s390x@nongnu.org
 
-SPARC target
+SPARC TCG target
 S: Odd Fixes
 F: tcg/sparc/
 F: disas/sparc.c
 
-TCI target
+TCI TCG target
 M: Stefan Weil <sw@weilnetz.de>
 S: Maintained
 F: tcg/tci/