Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150615-1' into staging

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0c14de18448b013a3b9c3ee89ec1052529cceec3..7ba2079c35b0a1f0a1de3caecf64d76817b3b156 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -486,7 +486,8 @@ F: hw/ppc/prep.c
 F: hw/pci-host/prep.[hc]
 F: hw/isa/pc87312.[hc]
 
-sPAPR
+sPAPR (pseries)
+M: David Gibson <[email protected]>
 M: Alexander Graf <[email protected]>
 L: [email protected]
 S: Supported
@@ -735,12 +736,14 @@ F: backends/rng*.c
 
 nvme
 M: Keith Busch <[email protected]>
+L: [email protected]
 S: Supported
 F: hw/block/nvme*
 F: tests/nvme-test.c
 
 megasas
 M: Hannes Reinecke <[email protected]>
+L: [email protected]
 S: Supported
 F: hw/scsi/megasas.c
 F: hw/scsi/mfi.h
@@ -758,10 +761,15 @@ S: Maintained
 F: hw/net/vmxnet*
 F: hw/scsi/vmw_pvscsi*
 
+Rocker
+M: Scott Feldman <[email protected]>
+M: Jiri Pirko <[email protected]>
+S: Maintained
+F: hw/net/rocker/
+
 Subsystems
 ----------
 Audio
-M: Vassili Karpov (malc) <[email protected]>
 M: Gerd Hoffmann <[email protected]>
 S: Maintained
 F: audio/
@@ -770,21 +778,27 @@ F: tests/ac97-test.c
 F: tests/es1370-test.c
 F: tests/intel-hda-test.c
 
-Block
+Block layer core
 M: Kevin Wolf <[email protected]>
-M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
 S: Supported
-F: async.c
-F: aio-*.c
 F: block*
 F: block/
 F: hw/block/
-F: migration/block*
+F: include/block/
 F: qemu-img*
 F: qemu-io*
-F: tests/image-fuzzer/
 F: tests/qemu-iotests/
 T: git git://repo.or.cz/qemu/kevin.git block
+
+Block I/O path
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: async.c
+F: aio-*.c
+F: block/io.c
+F: migration/block*
 T: git git://github.com/stefanha/qemu.git block
 
 Block Jobs
@@ -799,6 +813,14 @@ F: block/stream.h
 F: block/mirror.c
 T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 
+Block QAPI, monitor, command line
+M: Markus Armbruster <[email protected]>
+S: Supported
+F: blockdev.c
+F: block/qapi.c
+F: qapi/block*.json
+T: git git://repo.or.cz/qemu/armbru.git block-next
+
 Character Devices
 M: Paolo Bonzini <[email protected]>
 S: Maintained
@@ -919,20 +941,19 @@ K: srat|SRAT
 T: git git://github.com/ehabkost/qemu.git numa
 
 QAPI
-M: Luiz Capitulino <lcapitulino@redhat.com>
+M: Markus Armbruster <armbru@redhat.com>
 M: Michael Roth <[email protected]>
-S: Maintained
+S: Supported
 F: qapi/
 F: tests/qapi-schema/
-T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
 
 QAPI Schema
 M: Eric Blake <[email protected]>
-M: Luiz Capitulino <[email protected]>
 M: Markus Armbruster <[email protected]>
 S: Supported
 F: qapi-schema.json
-T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
 
 QObject
 M: Luiz Capitulino <[email protected]>
@@ -957,13 +978,14 @@ X: qom/cpu.c
 F: tests/qom-test.c
 
 QMP
-M: Luiz Capitulino <lcapitulino@redhat.com>
-S: Maintained
+M: Markus Armbruster <armbru@redhat.com>
+S: Supported
 F: qmp.c
 F: monitor.c
 F: qmp-commands.hx
-F: QMP/
-T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
+F: docs/qmp/
+F: scripts/qmp/
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
 
 SLIRP
 M: Jan Kiszka <[email protected]>
@@ -991,8 +1013,6 @@ M: Amit Shah <[email protected]>
 S: Maintained
 F: include/migration/
 F: migration/
-F: savevm.c
-F: arch_init.c
 F: scripts/vmstate-static-checker.py
 F: tests/vmstate-static-checker-data/
 
@@ -1107,6 +1127,7 @@ Block drivers
 -------------
 VMDK
 M: Fam Zheng <[email protected]>
+L: [email protected]
 S: Supported
 F: block/vmdk.c
 
@@ -1137,6 +1158,7 @@ T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 
 VDI
 M: Stefan Weil <[email protected]>
+L: [email protected]
 S: Maintained
 F: block/vdi.c
 
@@ -1144,6 +1166,7 @@ iSCSI
 M: Ronnie Sahlberg <[email protected]>
 M: Paolo Bonzini <[email protected]>
 M: Peter Lieven <[email protected]>
+L: [email protected]
 S: Supported
 F: block/iscsi.c
 
@@ -1201,3 +1224,86 @@ M: Alberto Garcia <[email protected]>
 S: Supported
 F: block/quorum.c
 L: [email protected]
+
+blkverify
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: block/blkverify.c
+
+bochs
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: block/bochs.c
+
+cloop
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: block/cloop.c
+
+dmg
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: block/dmg.c
+
+parallels
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: block/parallels.c
+
+qed
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: block/qed.c
+
+raw
+M: Kevin Wolf <[email protected]>
+L: [email protected]
+S: Supported
+F: block/linux-aio.c
+F: block/raw-aio.h
+F: block/raw-posix.c
+F: block/raw-win32.c
+F: block/raw_bsd.c
+F: block/win32-aio.c
+
+qcow2
+M: Kevin Wolf <[email protected]>
+L: [email protected]
+S: Supported
+F: block/qcow2*
+
+qcow
+M: Kevin Wolf <[email protected]>
+L: [email protected]
+S: Supported
+F: block/qcow.c
+
+blkdebug
+M: Kevin Wolf <[email protected]>
+L: [email protected]
+S: Supported
+F: block/blkdebug.c
+
+vpc
+M: Kevin Wolf <[email protected]>
+L: [email protected]
+S: Supported
+F: block/vpc.c
+
+vvfat
+M: Kevin Wolf <[email protected]>
+L: [email protected]
+S: Supported
+F: block/vvfat.c
+
+Image format fuzzer
+M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
+S: Supported
+F: tests/image-fuzzer/