Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2018-10-30-v3-tag' into...

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ce7c351afa403b0129ea4c8365d042b75a59f315..f2360efe3edac9d16dc4c70eecef6e390e9abec8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -88,6 +88,7 @@ F: hw/char/terminal3270.c
 F: hw/intc/s390_flic.c
 F: hw/intc/s390_flic_kvm.c
 F: hw/s390x/
+F: hw/vfio/ap.c
 F: hw/vfio/ccw.c
 F: hw/watchdog/wdt_diag288.c
 F: include/hw/s390x/
@@ -95,6 +96,7 @@ F: include/hw/watchdog/wdt_diag288.h
 F: pc-bios/s390-ccw/
 F: pc-bios/s390-ccw.img
 F: target/s390x/
+F: docs/vfio-ap.txt
 K: ^Subject:.*(?i)s390x?
 T: git git://github.com/cohuck/qemu.git s390-next
 L: [email protected]
@@ -200,6 +202,8 @@ F: include/hw/intc/mips_gic.h
 F: include/hw/timer/mips_gictimer.h
 F: tests/tcg/mips/
 F: disas/mips.c
+F: disas/nanomips.h
+F: disas/nanomips.cpp
 
 Moxie
 M: Anthony Green <[email protected]>
@@ -1207,6 +1211,20 @@ F: include/hw/s390x/s390-ccw.h
 T: git git://github.com/cohuck/qemu.git s390-next
 L: [email protected]
 
+vfio-ap
+M: Christian Borntraeger <[email protected]>
+M: Tony Krowiak <[email protected]>
+M: Halil Pasic <[email protected]>
+M: Pierre Morel <[email protected]>
+S: Supported
+F: hw/s390x/ap-device.c
+F: hw/s390x/ap-bridge.c
+F: include/hw/s390x/ap-device.h
+F: include/hw/s390x/ap-bridge.h
+F: hw/vfio/ap.c
+F: docs/vfio-ap.txt
+L: [email protected]
+
 vhost
 M: Michael S. Tsirkin <[email protected]>
 S: Supported
@@ -1403,6 +1421,13 @@ S: Odd Fixes
 W: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
 F: hw/display/cirrus*
 
+EDID Generator
+M: Gerd Hoffmann <[email protected]>
+S: Maintained
+F: hw/display/edid*
+F: include/hw/display/edid.h
+F: qemu-edid.c
+
 Subsystems
 ----------
 Audio
@@ -1771,7 +1796,7 @@ F: docs/devel/tracing.txt
 T: git git://github.com/stefanha/qemu.git tracing
 
 TPM
-M: Stefan Berger <stefanb@linux.vnet.ibm.com>
+M: Stefan Berger <[email protected]>
 S: Maintained
 F: tpm.c
 F: stubs/tpm.c
@@ -1896,6 +1921,11 @@ S: Maintained
 F: include/qemu/iova-tree.h
 F: util/iova-tree.c
 
+elf2dmp
+M: Viktor Prutyanov <[email protected]>
+S: Maintained
+F: contrib/elf2dmp/
+
 Usermode Emulation
 ------------------
 Overall
@@ -1995,11 +2025,9 @@ F: block/rbd.c
 T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 
 Sheepdog
-M: Hitoshi Mitake <[email protected]>
 M: Liu Yuan <[email protected]>
 M: Jeff Cody <[email protected]>
 L: [email protected]
-L: [email protected]
 S: Supported
 F: block/sheepdog.c
 T: git git://github.com/codyprime/qemu-kvm-jtc.git block