MAINTAINERS: Merge sections CPU, NUMA into Machine core

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index acbad134ecba49433c1417dc2302eac6f5e177f3..bcd9675f4ad20e3ede17ad94d2fb5e1282b7a061 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -212,9 +212,7 @@ R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: target/mips/
 F: default-configs/*mips*
-F: disas/mips.c
-F: disas/nanomips.cpp
-F: disas/nanomips.h
+F: disas/*mips*
 F: hw/intc/mips_gic.c
 F: hw/mips/
 F: hw/misc/mips_*
@@ -410,7 +408,7 @@ M: Paul Durrant <[email protected]>
 L: [email protected]
 S: Supported
 F: */xen*
-F: hw/9pfs/xen-9p-backend.c
+F: hw/9pfs/xen-9p*
 F: hw/char/xen_console.c
 F: hw/display/xenfb.c
 F: hw/net/xen_nic.c
@@ -930,6 +928,7 @@ M: Aurelien Jarno <[email protected]>
 R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: hw/mips/mips_malta.c
+F: hw/mips/gt64xxx_pci.c
 F: tests/acceptance/linux_ssh_mips_malta.py
 
 Mipssim
@@ -1268,8 +1267,12 @@ S: Supported
 F: hw/core/machine.c
 F: hw/core/null-machine.c
 F: hw/cpu/cluster.c
+F: numa.c
+F: qom/cpu.c
 F: include/hw/boards.h
 F: include/hw/cpu/cluster.h
+F: include/qom/cpu.h
+F: include/sysemu/numa.h
 T: git https://github.com/ehabkost/qemu.git machine-next
 
 Xtensa Machines
@@ -1499,6 +1502,7 @@ virtio-9p
 M: Greg Kurz <[email protected]>
 S: Supported
 F: hw/9pfs/
+X: hw/9pfs/xen-9p*
 F: fsdev/
 F: tests/virtio-9p-test.c
 T: git https://github.com/gkurz/qemu.git 9p-next
@@ -1833,11 +1837,6 @@ M: Markus Armbruster <[email protected]>
 S: Supported
 F: scripts/coverity-model.c
 
-CPU
-S: Supported
-F: qom/cpu.c
-F: include/qom/cpu.h
-
 Device Tree
 M: Alistair Francis <[email protected]>
 R: David Gibson <[email protected]>
@@ -1918,8 +1917,11 @@ F: qapi/run-state.json
 Human Monitor (HMP)
 M: Dr. David Alan Gilbert <[email protected]>
 S: Maintained
-F: monitor.c
-F: hmp.[ch]
+F: monitor/monitor-internal.h
+F: monitor/misc.c
+F: monitor/monitor.c
+F: monitor/hmp*
+F: hmp.h
 F: hmp-commands*.hx
 F: include/monitor/hmp-target.h
 F: tests/test-hmp.c
@@ -1942,13 +1944,6 @@ W: http://info.iet.unipi.it/~luigi/netmap/
 S: Maintained
 F: net/netmap.c
 
-NUMA
-M: Eduardo Habkost <[email protected]>
-S: Maintained
-F: numa.c
-F: include/sysemu/numa.h
-T: git https://github.com/ehabkost/qemu.git machine-next
-
 Host Memory Backends
 M: Eduardo Habkost <[email protected]>
 M: Igor Mammedov <[email protected]>
@@ -2026,21 +2021,32 @@ F: docs/interop/qemu-ga-ref.texi
 T: git https://github.com/mdroth/qemu.git qga
 
 QOM
-M: Andreas Färber <[email protected]>
+M: Paolo Bonzini <[email protected]>
+R: Daniel P. Berrange <[email protected]>
+R: Eduardo Habkost <[email protected]>
 S: Supported
-T: git https://github.com/afaerber/qemu-cpu.git qom-next
+F: docs/qdev-device-use.txt
+F: hw/core/qdev*
+F: include/hw/qdev*
+F: include/monitor/qdev.h
 F: include/qom/
 X: include/qom/cpu.h
+F: qapi/qom.json
+F: qapi/qdev.json
+F: qdev-monitor.c
 F: qom/
 X: qom/cpu.c
 F: tests/check-qom-interface.c
 F: tests/check-qom-proplist.c
+F: tests/test-qdev-global-props.c
 
 QMP
 M: Markus Armbruster <[email protected]>
 S: Supported
-F: qmp.c
-F: monitor.c
+F: monitor/monitor-internal.h
+F: monitor/qmp*
+F: monitor/misc.c
+F: monitor/monitor.c
 F: docs/devel/*qmp-*
 F: docs/interop/*qmp-*
 F: scripts/qmp/
@@ -2320,7 +2326,6 @@ M: Aurelien Jarno <[email protected]>
 R: Aleksandar Rikalo <[email protected]>
 S: Maintained
 F: tcg/mips/
-F: disas/mips.c
 
 PPC TCG target
 M: Richard Henderson <[email protected]>