block: new bdrv_reopen_bitmaps_rw interface

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7df088259b210d9a10c4e0700869f7828bf60914..9529c9484c73b5d07da85ad30a50f4537a962190 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -299,7 +299,7 @@ F: target/ppc/kvm.c
 
 S390
 M: Christian Borntraeger <[email protected]>
-M: Cornelia Huck <co[email protected].com>
+M: Cornelia Huck <cohuck@redhat.com>
 M: Alexander Graf <[email protected]>
 S: Maintained
 F: target/s390x/kvm.c
@@ -778,7 +778,7 @@ F: include/hw/sparc/grlib.h
 S390 Machines
 -------------
 S390 Virtio-ccw
-M: Cornelia Huck <co[email protected].com>
+M: Cornelia Huck <cohuck@redhat.com>
 M: Christian Borntraeger <[email protected]>
 M: Alexander Graf <[email protected]>
 S: Supported
@@ -1006,7 +1006,7 @@ F: hw/vfio/*
 F: include/hw/vfio/
 
 vfio-ccw
-M: Cornelia Huck <co[email protected].com>
+M: Cornelia Huck <cohuck@redhat.com>
 S: Supported
 F: hw/vfio/ccw.c
 F: hw/s390x/s390-ccw.c
@@ -1048,7 +1048,7 @@ F: tests/virtio-blk-test.c
 T: git git://github.com/stefanha/qemu.git block
 
 virtio-ccw
-M: Cornelia Huck <co[email protected].com>
+M: Cornelia Huck <cohuck@redhat.com>
 M: Christian Borntraeger <[email protected]>
 S: Supported
 F: hw/s390x/virtio-ccw.[hc]
@@ -1238,13 +1238,12 @@ M: Paolo Bonzini <[email protected]>
 M: Marc-André Lureau <[email protected]>
 S: Maintained
 F: chardev/
-F: backends/msmouse.c
-F: backends/testdev.c
+F: include/chardev/
 
 Character Devices (Braille)
 M: Samuel Thibault <[email protected]>
 S: Maintained
-F: backends/baum.c
+F: chardev/baum.c
 
 Command line option argument parsing
 M: Markus Armbruster <[email protected]>
@@ -1349,15 +1348,6 @@ W: http://info.iet.unipi.it/~luigi/netmap/
 S: Maintained
 F: net/netmap.c
 
-Network Block Device (NBD)
-M: Paolo Bonzini <[email protected]>
-S: Odd Fixes
-F: block/nbd*
-F: nbd/
-F: include/block/nbd*
-F: qemu-nbd.c
-T: git git://github.com/bonzini/qemu.git nbd-next
-
 NUMA
 M: Eduardo Habkost <[email protected]>
 S: Maintained
@@ -1412,8 +1402,7 @@ F: include/qapi/qmp/
 X: include/qapi/qmp/dispatch.h
 F: scripts/coccinelle/qobject.cocci
 F: tests/check-qdict.c
-F: tests/check-qfloat.c
-F: tests/check-qint.c
+F: tests/check-qnum.c
 F: tests/check-qjson.c
 F: tests/check-qlist.c
 F: tests/check-qstring.c
@@ -1491,7 +1480,7 @@ F: tests/vmstate-static-checker-data/
 F: docs/migration.txt
 
 Seccomp
-M: Eduardo Otubo <eduardo.otubo@profitbricks.com>
+M: Eduardo Otubo <otubo@redhat.com>
 S: Supported
 F: qemu-seccomp.c
 F: include/sysemu/seccomp.h
@@ -1712,6 +1701,18 @@ S: Supported
 F: block/iscsi.c
 F: block/iscsi-opts.c
 
+Network Block Device (NBD)
+M: Eric Blake <[email protected]>
+M: Paolo Bonzini <[email protected]>
+L: [email protected]
+S: Maintained
+F: block/nbd*
+F: nbd/
+F: include/block/nbd*
+F: qemu-nbd.*
+F: blockdev-nbd.c
+T: git git://repo.or.cz/qemu/ericb.git nbd
+
 NFS
 M: Jeff Cody <[email protected]>
 M: Peter Lieven <[email protected]>
@@ -1859,12 +1860,14 @@ Build and test automation
 -------------------------
 M: Alex Bennée <[email protected]>
 M: Fam Zheng <[email protected]>
+R: Philippe Mathieu-Daudé <[email protected]>
 L: [email protected]
 S: Maintained
 F: .travis.yml
 F: .shippable.yml
 F: tests/docker/
 W: https://travis-ci.org/qemu/qemu
+W: https://app.shippable.com/github/qemu/qemu
 W: http://patchew.org/QEMU/
 
 Documentation