Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e41271c64f96e603415cc2db88173a7105409f78..be79f68f46e7f40a8c0ca0db8e36ada488d43b59 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -187,6 +187,14 @@ F: disas/moxie.c
 F: hw/moxie/
 F: default-configs/moxie-softmmu.mak
 
+NiosII
+M: Chris Wulff <[email protected]>
+M: Marek Vasut <[email protected]>
+S: Maintained
+F: target/nios2/
+F: hw/nios2/
+F: disas/nios2.c
+
 OpenRISC
 M: Jia Liu <[email protected]>
 S: Maintained
@@ -315,7 +323,7 @@ Guest CPU Cores (Xen):
 X86
 M: Stefano Stabellini <[email protected]>
 M: Anthony Perard <[email protected]>
-L: [email protected]source.com
+L: [email protected]project.org
 S: Supported
 F: xen-*
 F: */xen*
@@ -553,20 +561,19 @@ F: hw/lm32/milkymist.c
 M68K Machines
 -------------
 an5206
-S: Orphan
+M: Thomas Huth <[email protected]>
+S: Odd Fixes
 F: hw/m68k/an5206.c
 F: hw/m68k/mcf5206.c
 
-dummy_m68k
-S: Orphan
-F: hw/m68k/dummy_m68k.c
-
 mcf5208
-S: Orphan
+M: Thomas Huth <[email protected]>
+S: Odd Fixes
 F: hw/m68k/mcf5208.c
 F: hw/m68k/mcf_intc.c
 F: hw/char/mcf_uart.c
 F: hw/net/mcf_fec.c
+F: include/hw/m68k/mcf*.h
 
 MicroBlaze Machines
 -------------------
@@ -663,10 +670,13 @@ F: hw/misc/macio/
 F: hw/intc/heathrow_pic.c
 
 PReP
+M: Hervé Poussineau <[email protected]>
 L: [email protected]
 L: [email protected]
-S: Odd Fixes
+S: Maintained
 F: hw/ppc/prep.c
+F: hw/ppc/prep_systemio.c
+F: hw/ppc/rs6000_mc.c
 F: hw/pci-host/prep.[hc]
 F: hw/isa/pc87312.[hc]
 F: pc-bios/ppc_rom.bin
@@ -1023,7 +1033,7 @@ F: hw/input/virtio-input*.c
 F: include/hw/virtio/virtio-input.h
 
 virtio-serial
-M: Amit Shah <amit[email protected]>
+M: Amit Shah <amit@kernel.org>
 S: Supported
 F: hw/char/virtio-serial-bus.c
 F: hw/char/virtio-console.c
@@ -1032,7 +1042,7 @@ F: tests/virtio-console-test.c
 F: tests/virtio-serial-test.c
 
 virtio-rng
-M: Amit Shah <amit[email protected]>
+M: Amit Shah <amit@kernel.org>
 S: Supported
 F: hw/virtio/virtio-rng.c
 F: include/hw/virtio/virtio-rng.h
@@ -1186,8 +1196,9 @@ T: git git://github.com/jnsnow/qemu.git bitmaps
 
 Character device backends
 M: Paolo Bonzini <[email protected]>
+M: Marc-André Lureau <[email protected]>
 S: Maintained
-F: qemu-char.c
+F: chardev/
 F: backends/msmouse.c
 F: backends/testdev.c
 
@@ -1419,7 +1430,6 @@ F: scripts/checkpatch.pl
 
 Migration
 M: Juan Quintela <[email protected]>
-M: Amit Shah <[email protected]>
 M: Dr. David Alan Gilbert <[email protected]>
 S: Maintained
 F: include/migration/
@@ -1634,6 +1644,7 @@ M: Peter Lieven <[email protected]>
 L: [email protected]
 S: Supported
 F: block/iscsi.c
+F: block/iscsi-opts.c
 
 NFS
 M: Jeff Cody <[email protected]>
@@ -1789,9 +1800,14 @@ F: docs/block-replication.txt
 Build and test automation
 -------------------------
 M: Alex Bennée <[email protected]>
+M: Fam Zheng <[email protected]>
 L: [email protected]
-S: Supported
+S: Maintained
 F: .travis.yml
+F: .shippable.yml
+F: tests/docker/
+W: https://travis-ci.org/qemu/qemu
+W: http://patchew.org/QEMU/
 
 Documentation
 -------------
@@ -1800,9 +1816,3 @@ M: Daniel P. Berrange <[email protected]>
 S: Odd Fixes
 F: docs/build-system.txt
 
-Docker testing
---------------
-Docker based testing framework and cases
-M: Fam Zheng <[email protected]>
-S: Maintained
-F: tests/docker/