nbd: Group all Linux-specific ioctl code in one place

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 66abde83f586b20f5dc168947a8129794c5e90ee..df990a8ff6c948eba2edb53f4bf1a8124cbd32d4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -165,6 +165,7 @@ F: hw/openrisc/
 F: tests/tcg/openrisc/
 
 PowerPC
+M: David Gibson <[email protected]>
 M: Alexander Graf <[email protected]>
 L: [email protected]
 S: Maintained
@@ -358,10 +359,7 @@ F: include/hw/timer/a9gtimer.h
 F: include/hw/timer/arm_mptimer.h
 
 Exynos
-M: Evgeny Voevodin <[email protected]>
-M: Maksim Kozlov <[email protected]>
 M: Igor Mitsyanko <[email protected]>
-M: Dmitry Solodkiy <[email protected]>
 L: [email protected]
 S: Maintained
 F: hw/*/exynos*
@@ -600,7 +598,7 @@ F: hw/pci-host/grackle.c
 F: hw/misc/macio/
 
 PReP
-M: Andreas Färber <[email protected]>
+L: [email protected]
 L: [email protected]
 S: Odd Fixes
 F: hw/ppc/prep.c
@@ -956,6 +954,14 @@ S: Maintained
 F: hw/*/xilinx_*
 F: include/hw/xilinx.h
 
+Network packet abstractions
+M: Dmitry Fleytman <[email protected]>
+S: Maintained
+F: include/net/eth.h
+F: net/eth.c
+F: hw/net/net_rx_pkt*
+F: hw/net/net_tx_pkt*
+
 Vmware
 M: Dmitry Fleytman <[email protected]>
 S: Maintained
@@ -975,6 +981,16 @@ F: hw/acpi/nvdimm.c
 F: hw/mem/nvdimm.c
 F: include/hw/mem/nvdimm.h
 
+e1000x
+M: Dmitry Fleytman <[email protected]>
+S: Maintained
+F: hw/net/e1000x*
+
+e1000e
+M: Dmitry Fleytman <[email protected]>
+S: Maintained
+F: hw/net/e1000e*
+
 Subsystems
 ----------
 Audio
@@ -988,6 +1004,7 @@ F: tests/intel-hda-test.c
 
 Block layer core
 M: Kevin Wolf <[email protected]>
+M: Max Reitz <[email protected]>
 L: [email protected]
 S: Supported
 F: block*
@@ -1001,6 +1018,7 @@ T: git git://repo.or.cz/qemu/kevin.git block
 
 Block I/O path
 M: Stefan Hajnoczi <[email protected]>
+M: Fam Zheng <[email protected]>
 L: [email protected]
 S: Supported
 F: async.c
@@ -1047,11 +1065,10 @@ S: Supported
 F: scripts/coverity-model.c
 
 CPU
-M: Andreas Färber <[email protected]>
+L: [email protected]
 S: Supported
 F: qom/cpu.c
 F: include/qom/cpu.h
-F: target-i386/cpu.c
 
 ICC Bus
 M: Igor Mammedov <[email protected]>
@@ -1107,7 +1124,6 @@ F: ui/
 F: include/ui/
 
 Cocoa graphics
-M: Andreas Färber <[email protected]>
 M: Peter Maydell <[email protected]>
 S: Odd Fixes
 F: ui/cocoa.m
@@ -1157,8 +1173,6 @@ M: Eduardo Habkost <[email protected]>
 S: Maintained
 F: numa.c
 F: include/sysemu/numa.h
-K: numa|NUMA
-K: srat|SRAT
 T: git git://github.com/ehabkost/qemu.git numa
 
 QAPI
@@ -1404,9 +1418,8 @@ S: Orphan
 
 Stable 0.15
 L: [email protected]
-M: Andreas Färber <[email protected]>
 T: git git://git.qemu-project.org/qemu-stable-0.15.git
-S: Supported
+S: Orphan
 
 Stable 0.14
 L: [email protected]
@@ -1571,6 +1584,7 @@ F: block/win32-aio.c
 
 qcow2
 M: Kevin Wolf <[email protected]>
+M: Max Reitz <[email protected]>
 L: [email protected]
 S: Supported
 F: block/qcow2*
@@ -1583,6 +1597,7 @@ F: block/qcow.c
 
 blkdebug
 M: Kevin Wolf <[email protected]>
+M: Max Reitz <[email protected]>
 L: [email protected]
 S: Supported
 F: block/blkdebug.c
@@ -1618,3 +1633,10 @@ Build system architecture
 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/