virtio-serial: convert to virtio_map

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 29c6834852d3226cd20dc8fc9d7e8911631036d1..314411332c5ccec2233130a38b9ac139e48c4127 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -50,14 +50,12 @@ Descriptions of section entries:
 
 General Project Administration
 ------------------------------
-M: Anthony Liguori <[email protected]>
 M: Peter Maydell <[email protected]>
 
 Responsible Disclosure, Reporting Security Issues
 ------------------------------
 W: http://wiki.qemu.org/SecurityProcess
 M: Michael S. Tsirkin <[email protected]>
-M: Anthony Liguori <[email protected]>
 L: [email protected]
 
 Guest CPU cores (TCG):
@@ -79,6 +77,7 @@ S: Maintained
 F: target-alpha/
 F: hw/alpha/
 F: tests/tcg/alpha/
+F: disas/alpha.c
 
 ARM
 M: Peter Maydell <[email protected]>
@@ -86,6 +85,9 @@ S: Maintained
 F: target-arm/
 F: hw/arm/
 F: hw/cpu/a*mpcore.c
+F: disas/arm.c
+F: disas/arm-a64.cc
+F: disas/libvixl/
 
 CRIS
 M: Edgar E. Iglesias <[email protected]>
@@ -93,6 +95,7 @@ S: Maintained
 F: target-cris/
 F: hw/cris/
 F: tests/tcg/cris/
+F: disas/cris.c
 
 LM32
 M: Michael Walle <[email protected]>
@@ -116,6 +119,7 @@ M: Edgar E. Iglesias <[email protected]>
 S: Maintained
 F: target-microblaze/
 F: hw/microblaze/
+F: disas/microblaze.c
 
 MIPS
 M: Aurelien Jarno <[email protected]>
@@ -124,11 +128,13 @@ S: Maintained
 F: target-mips/
 F: hw/mips/
 F: tests/tcg/mips/
+F: disas/mips.c
 
 Moxie
 M: Anthony Green <[email protected]>
 S: Maintained
 F: target-moxie/
+F: disas/moxie.c
 
 OpenRISC
 M: Jia Liu <[email protected]>
@@ -143,6 +149,7 @@ L: [email protected]
 S: Maintained
 F: target-ppc/
 F: hw/ppc/
+F: disas/ppc.c
 
 S390
 M: Richard Henderson <[email protected]>
@@ -150,19 +157,23 @@ M: Alexander Graf <[email protected]>
 S: Maintained
 F: target-s390x/
 F: hw/s390x/
+F: disas/s390.c
 
 SH4
 M: Aurelien Jarno <[email protected]>
 S: Odd Fixes
 F: target-sh4/
 F: hw/sh4/
+F: disas/sh4.c
 
 SPARC
 M: Blue Swirl <[email protected]>
+M: Mark Cave-Ayland <[email protected]>
 S: Maintained
 F: target-sparc/
 F: hw/sparc/
 F: hw/sparc64/
+F: disas/sparc.c
 
 UniCore32
 M: Guan Xuetao <[email protected]>
@@ -173,9 +184,11 @@ F: hw/unicore32/
 X86
 M: Paolo Bonzini <[email protected]>
 M: Richard Henderson <[email protected]>
-S: Odd Fixes
+M: Eduardo Habkost <[email protected]>
+S: Maintained
 F: target-i386/
 F: hw/i386/
+F: disas/i386.c
 
 Xtensa
 M: Max Filippov <[email protected]>
@@ -242,6 +255,12 @@ L: [email protected]
 S: Supported
 F: xen-*
 F: */xen*
+F: hw/char/xen_console.c
+F: hw/display/xenfb.c
+F: hw/net/xen_nic.c
+F: hw/xen/
+F: hw/xenpv/
+F: include/hw/xen/
 
 Hosts:
 ------
@@ -262,16 +281,47 @@ L: [email protected]
 M: Stefan Weil <[email protected]>
 S: Maintained
 F: *win32*
+F: qemu.nsi
 
 ARM Machines
 ------------
 Allwinner-a10
-M: Li Guang <[email protected].com>
+M: Beniamino Galvani <b.galvani@gmail.com>
 S: Maintained
-F: hw/*/allwinner-a10*
-F: include/hw/*/allwinner-a10*
+F: hw/*/allwinner*
+F: include/hw/*/allwinner*
 F: hw/arm/cubieboard.c
 
+ARM PrimeCell
+M: Peter Maydell <[email protected]>
+S: Maintained
+F: hw/char/pl011.c
+F: hw/display/pl110*
+F: hw/dma/pl080.c
+F: hw/dma/pl330.c
+F: hw/gpio/pl061.c
+F: hw/input/pl050.c
+F: hw/intc/pl190.c
+F: hw/sd/pl181.c
+F: hw/timer/pl031.c
+F: include/hw/arm/primecell.h
+
+ARM cores
+M: Peter Maydell <[email protected]>
+S: Maintained
+F: hw/intc/arm*
+F: hw/intc/gic_internal.h
+F: hw/misc/a9scu.c
+F: hw/misc/arm11scu.c
+F: hw/timer/a9gtimer*
+F: hw/timer/arm_*
+F: include/hw/arm/arm.h
+F: include/hw/intc/arm*
+F: include/hw/misc/a9scu.h
+F: include/hw/misc/arm11scu.h
+F: include/hw/timer/a9gtimer.h
+F: include/hw/timer/arm_mptimer.h
+
 Exynos
 M: Evgeny Voevodin <[email protected]>
 M: Maksim Kozlov <[email protected]>
@@ -308,11 +358,6 @@ M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/arm/integratorcp.c
 
-Mainstone
-L: [email protected]
-S: Orphan
-F: hw/arm/mainstone.c
-
 Musicpal
 M: Jan Kiszka <[email protected]>
 S: Maintained
@@ -332,11 +377,17 @@ Real View
 M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/arm/realview*
+F: hw/intc/realview_gic.c
+F: include/hw/intc/realview_gic.h
 
-Spitz
+PXA2XX
 M: Andrzej Zaborowski <[email protected]>
 S: Maintained
+F: hw/arm/mainstone.c
 F: hw/arm/spitz.c
+F: hw/arm/tosa.c
+F: hw/arm/z2.c
+F: hw/*/pxa2xx*
 
 Stellaris
 M: Peter Maydell <[email protected]>
@@ -349,13 +400,29 @@ S: Maintained
 F: hw/*/versatile*
 
 Xilinx Zynq
-M: Peter Crosthwaite <[email protected]>
+M: Alistair Francis <[email protected]>
+M: Peter Crosthwaite <[email protected]>
 S: Maintained
 F: hw/arm/xilinx_zynq.c
 F: hw/misc/zynq_slcr.c
 F: hw/*/cadence_*
 F: hw/ssi/xilinx_spips.c
 
+Xilinx ZynqMP
+M: Alistair Francis <[email protected]>
+M: Peter Crosthwaite <[email protected]>
+S: Maintained
+F: hw/arm/xlnx-zynqmp.c
+F: hw/arm/xlnx-ep108.c
+F: include/hw/arm/xlnx-zynqmp.h
+
+ARM ACPI Subsystem
+M: Shannon Zhao <[email protected]>
+M: Shannon Zhao <[email protected]>
+S: Maintained
+F: hw/arm/virt-acpi-build.c
+F: include/hw/arm/virt-acpi-build.h
+
 CRIS Machines
 -------------
 Axis Dev88
@@ -398,7 +465,7 @@ S: Maintained
 F: hw/microblaze/petalogix_s3adsp1800_mmu.c
 
 petalogix_ml605
-M: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
 S: Maintained
 F: hw/microblaze/petalogix_ml605_mmu.c
 
@@ -486,7 +553,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
@@ -518,11 +586,13 @@ SPARC Machines
 --------------
 Sun4m
 M: Blue Swirl <[email protected]>
+M: Mark Cave-Ayland <[email protected]>
 S: Maintained
 F: hw/sparc/sun4m.c
 
 Sun4u
 M: Blue Swirl <[email protected]>
+M: Mark Cave-Ayland <[email protected]>
 S: Maintained
 F: hw/sparc64/sun4u.c
 
@@ -545,11 +615,13 @@ M: Cornelia Huck <[email protected]>
 M: Christian Borntraeger <[email protected]>
 M: Alexander Graf <[email protected]>
 S: Supported
+F: hw/char/sclp*.[hc]
 F: hw/s390x/s390-virtio-ccw.c
 F: hw/s390x/css.[hc]
 F: hw/s390x/sclp*.[hc]
 F: hw/s390x/ipl*.[hc]
 F: hw/s390x/*pci*.[hc]
+F: hw/s390x/s390-skeys*.c
 F: include/hw/s390x/
 F: pc-bios/s390-ccw/
 T: git git://github.com/cohuck/qemu virtio-ccw-upstr
@@ -565,7 +637,6 @@ F: hw/unicore32/
 X86 Machines
 ------------
 PC
-M: Anthony Liguori <[email protected]>
 M: Michael S. Tsirkin <[email protected]>
 S: Supported
 F: include/hw/i386/
@@ -582,6 +653,25 @@ F: hw/acpi/piix4.c
 F: hw/acpi/ich9.c
 F: include/hw/acpi/ich9.h
 F: include/hw/acpi/piix.h
+F: hw/misc/sga.c
+
+PC Chipset
+M: Michael S. Tsirkin <[email protected]>
+M: Paolo Bonzini <[email protected]>
+S: Support
+F: hw/char/debugcon.c
+F: hw/char/parallel.c
+F: hw/char/serial*
+F: hw/dma/i8257*
+F: hw/i2c/pm_smbus.c
+F: hw/intc/apic*
+F: hw/intc/ioapic*
+F: hw/intc/i8259*
+F: hw/misc/debugexit.c
+F: hw/misc/pc-testdev.c
+F: hw/timer/hpet*
+F: hw/timer/i8254*
+F: hw/timer/mc146818rtc*
 
 
 Xtensa Machines
@@ -599,24 +689,67 @@ F: hw/net/opencores_eth.c
 
 Devices
 -------
+EDU
+M: Jiri Slaby <[email protected]>
+S: Maintained
+F: hw/misc/edu.c
+
 IDE
-M: Kevin Wolf <kwolf@redhat.com>
-M: Stefan Hajnoczi <[email protected]>
-S: Odd Fixes
+M: John Snow <jsnow@redhat.com>
+L: [email protected]
+S: Supported
 F: include/hw/ide.h
 F: hw/ide/
+F: hw/block/block.c
+F: hw/block/cdrom.c
+F: hw/block/hd-geometry.c
+F: tests/ide-test.c
+F: tests/ahci-test.c
+F: tests/libqos/ahci*
+T: git git://github.com/jnsnow/qemu.git ide
+
+Floppy
+M: John Snow <[email protected]>
+L: [email protected]
+S: Supported
+F: hw/block/fdc.c
+F: include/hw/block/fdc.h
+F: tests/fdc-test.c
+T: git git://github.com/jnsnow/qemu.git ide
 
 OMAP
 M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/*/omap*
 
+IPack
+M: Alberto Garcia <[email protected]>
+S: Odd Fixes
+F: hw/char/ipoctal232.c
+F: hw/ipack/
+
 PCI
 M: Michael S. Tsirkin <[email protected]>
 S: Supported
 F: include/hw/pci/*
+F: hw/misc/pci-testdev.c
 F: hw/pci/*
+F: hw/pci-bridge/*
+
+ACPI/SMBIOS
+M: Michael S. Tsirkin <[email protected]>
+M: Igor Mammedov <[email protected]>
+S: Supported
+F: include/hw/acpi/*
+F: include/hw/smbios/*
+F: hw/mem/*
 F: hw/acpi/*
+F: hw/smbios/*
+F: hw/i386/acpi-build.[hc]
+F: hw/i386/*dsl
+F: hw/arm/virt-acpi-build.c
+F: include/hw/arm/virt-acpi-build.h
+F: scripts/acpi*py
 
 ppc4xx
 M: Alexander Graf <[email protected]>
@@ -630,6 +763,19 @@ M: Scott Wood <[email protected]>
 L: [email protected]
 S: Supported
 F: hw/ppc/e500*
+F: hw/pci-host/ppce500.c
+F: hw/net/fsl_etsec/
+
+Character devices
+M: Paolo Bonzini <[email protected]>
+S: Odd Fixes
+F: hw/char/
+
+Network devices
+M: Jason Wang <[email protected]>
+S: Odd Fixes
+F: hw/net/
+T: git git://github.com/jasowang/qemu.git net
 
 SCSI
 M: Paolo Bonzini <[email protected]>
@@ -643,10 +789,17 @@ S: Orphan
 F: hw/scsi/lsi53c895a.c
 
 SSI
-M: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+M: Peter Crosthwaite <crosthwaite.peter@gmail.com>
 S: Maintained
 F: hw/ssi/*
 F: hw/block/m25p80.c
+X: hw/ssi/xilinx_*
+
+Xilinx SPI
+M: Alistair Francis <[email protected]>
+M: Peter Crosthwaite <[email protected]>
+S: Maintained
+F: hw/ssi/xilinx_*
 
 USB
 M: Gerd Hoffmann <[email protected]>
@@ -671,10 +824,10 @@ S: Supported
 F: hw/*/*vhost*
 
 virtio
-M: Anthony Liguori <[email protected]>
 M: Michael S. Tsirkin <[email protected]>
 S: Supported
 F: hw/*/virtio*
+F: net/vhost-user.c
 
 virtio-9p
 M: Aneesh Kumar K.V <[email protected]>
@@ -685,10 +838,13 @@ F: tests/virtio-9p-test.c
 T: git git://github.com/kvaneesh/QEMU.git
 
 virtio-blk
-M: Kevin Wolf <[email protected]>
 M: Stefan Hajnoczi <[email protected]>
+L: [email protected]
 S: Supported
 F: hw/block/virtio-blk.c
+F: hw/block/dataplane/*
+F: hw/virtio/dataplane/*
+T: git git://github.com/stefanha/qemu.git block
 
 virtio-ccw
 M: Cornelia Huck <[email protected]>
@@ -697,6 +853,12 @@ S: Supported
 F: hw/s390x/virtio-ccw.[hc]
 T: git git://github.com/cohuck/qemu virtio-ccw-upstr
 
+virtio-input
+M: Gerd Hoffmann <[email protected]>
+S: Maintained
+F: hw/input/virtio-input*.c
+F: include/hw/virtio/virtio-input.h
+
 virtio-serial
 M: Amit Shah <[email protected]>
 S: Supported
@@ -713,19 +875,22 @@ 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
 
 Xilinx EDK
-M: Peter Crosthwaite <[email protected]>
 M: Edgar E. Iglesias <[email protected]>
+M: Alistair Francis <[email protected]>
+M: Peter Crosthwaite <[email protected]>
 S: Maintained
 F: hw/*/xilinx_*
 F: include/hw/xilinx.h
@@ -736,10 +901,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/
@@ -748,24 +918,50 @@ 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: 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
 
-Character Devices
-M: Anthony Liguori <[email protected]>
+Block Jobs
+M: Jeff Cody <[email protected]>
+L: [email protected]
+S: Supported
+F: blockjob.c
+F: include/block/blockjob.h
+F: block/backup.c
+F: block/commit.c
+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 device backends
 M: Paolo Bonzini <[email protected]>
 S: Maintained
 F: qemu-char.c
@@ -777,6 +973,11 @@ M: Samuel Thibault <[email protected]>
 S: Maintained
 F: backends/baum.c
 
+Coverity model
+M: Markus Armbruster <[email protected]>
+S: Supported
+F: scripts/coverity-model.c
+
 CPU
 M: Andreas Färber <[email protected]>
 S: Supported
@@ -791,11 +992,19 @@ F: include/hw/cpu/icc_bus.h
 F: hw/cpu/icc_bus.c
 
 Device Tree
-M: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+M: Peter Crosthwaite <crosthwaite.peter@gmail.com>
 M: Alexander Graf <[email protected]>
 S: Maintained
 F: device_tree.[ch]
 
+Error reporting
+M: Markus Armbruster <[email protected]>
+S: Supported
+F: include/qapi/error.h
+F: include/qemu/error-report.h
+F: util/error.c
+F: util/qemu-error.c
+
 GDB stub
 L: [email protected]
 S: Odd Fixes
@@ -821,7 +1030,6 @@ F: audio/spiceaudio.c
 F: hw/display/qxl*
 
 Graphics
-M: Anthony Liguori <[email protected]>
 M: Gerd Hoffmann <[email protected]>
 S: Odd Fixes
 F: ui/
@@ -833,7 +1041,6 @@ S: Odd Fixes
 F: ui/cocoa.m
 
 Main loop
-M: Anthony Liguori <[email protected]>
 M: Paolo Bonzini <[email protected]>
 S: Maintained
 F: cpus.c
@@ -849,12 +1056,11 @@ F: hmp.c
 F: hmp-commands.hx
 T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
 
-Network device layer
-M: Anthony Liguori <[email protected]>
-M: Stefan Hajnoczi <[email protected]>
+Network device backends
+M: Jason Wang <[email protected]>
 S: Maintained
 F: net/
-T: git git://github.com/stefanha/qemu.git net
+T: git git://github.com/jasowang/qemu.git net
 
 Netmap network backend
 M: Luigi Rizzo <[email protected]>
@@ -872,26 +1078,51 @@ F: nbd.*
 F: qemu-nbd.c
 T: git git://github.com/bonzini/qemu.git nbd-next
 
+NUMA
+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
-M: Luiz Capitulino <lcapitulino@redhat.com>
+M: Markus Armbruster <armbru@redhat.com>
 M: Michael Roth <[email protected]>
-S: Maintained
+S: Supported
 F: qapi/
+X: qapi/*.json
+F: include/qapi/
+X: include/qapi/qmp/
+F: include/qapi/qmp/dispatch.h
 F: tests/qapi-schema/
-T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
+F: tests/test-*-visitor.c
+F: tests/test-qmp-*.c
+F: scripts/qapi*
+F: docs/qapi*
+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
+F: qapi/*.json
+T: git git://repo.or.cz/qemu/armbru.git qapi-next
 
 QObject
 M: Luiz Capitulino <[email protected]>
 S: Maintained
 F: qobject/
+F: include/qapi/qmp/
+X: include/qapi/qmp/dispatch.h
+F: tests/check-qdict.c
+F: tests/check-qfloat.c
+F: tests/check-qint.c
+F: tests/check-qjson.c
+F: tests/check-qlist.c
+F: tests/check-qstring.c
 T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
 
 QEMU Guest Agent
@@ -901,7 +1132,6 @@ F: qga/
 T: git git://github.com/mdroth/qemu.git qga
 
 QOM
-M: Anthony Liguori <[email protected]>
 M: Andreas Färber <[email protected]>
 S: Supported
 T: git git://github.com/afaerber/qemu-cpu.git qom-next
@@ -912,13 +1142,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]>
@@ -946,8 +1177,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/
 
@@ -957,6 +1186,26 @@ S: Supported
 F: qemu-seccomp.c
 F: include/sysemu/seccomp.h
 
+Cryptography
+M: Daniel P. Berrange <[email protected]>
+S: Maintained
+F: crypto/
+F: include/crypto/
+F: tests/test-crypto-*
+
+Coroutines
+M: Stefan Hajnoczi <[email protected]>
+M: Kevin Wolf <[email protected]>
+F: util/*coroutine*
+F: include/qemu/coroutine*
+F: tests/test-coroutine.c
+
+Buffers
+M: Daniel P. Berrange <[email protected]>
+S: Odd fixes
+F: util/buffer.c
+F: include/qemu/buffer.h
+
 Usermode Emulation
 ------------------
 Overall
@@ -987,53 +1236,58 @@ M: Claudio Fontana <[email protected]>
 M: Claudio Fontana <[email protected]>
 S: Maintained
 F: tcg/aarch64/
+F: disas/arm-a64.cc
+F: disas/libvixl/
 
 ARM target
 M: Andrzej Zaborowski <[email protected]>
 S: Maintained
 F: tcg/arm/
+F: disas/arm.c
 
 i386 target
 L: [email protected]
 S: Maintained
 F: tcg/i386/
+F: disas/i386.c
 
 IA64 target
 M: Aurelien Jarno <[email protected]>
 S: Maintained
 F: tcg/ia64/
+F: disas/ia64.c
 
 MIPS target
 M: Aurelien Jarno <[email protected]>
 S: Maintained
 F: tcg/mips/
+F: disas/mips.c
 
 PPC
 M: Vassili Karpov (malc) <[email protected]>
 S: Maintained
 F: tcg/ppc/
-
-PPC64 target
-M: Vassili Karpov (malc) <[email protected]>
-S: Maintained
-F: tcg/ppc64/
+F: disas/ppc.c
 
 S390 target
 M: Alexander Graf <[email protected]>
 M: Richard Henderson <[email protected]>
 S: Maintained
 F: tcg/s390/
+F: disas/s390.c
 
 SPARC target
 M: Blue Swirl <[email protected]>
 S: Maintained
 F: tcg/sparc/
+F: disas/sparc.c
 
 TCI target
 M: Stefan Weil <[email protected]>
 S: Maintained
 F: tcg/tci/
 F: tci.c
+F: disas/tci.c
 
 Stable branches
 ---------------
@@ -1062,28 +1316,38 @@ Block drivers
 -------------
 VMDK
 M: Fam Zheng <[email protected]>
+L: [email protected]
 S: Supported
 F: block/vmdk.c
 
 RBD
-M: Josh Durgin <[email protected]>
+M: Josh Durgin <[email protected]>
+M: Jeff Cody <[email protected]>
+L: [email protected]
 S: Supported
 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
 
 VHDX
 M: Jeff Cody <[email protected]>
+L: [email protected]
 S: Supported
 F: block/vhdx*
+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
 
@@ -1091,26 +1355,153 @@ 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
 
 NFS
+M: Jeff Cody <[email protected]>
 M: Peter Lieven <[email protected]>
+L: [email protected]
 S: Maintained
 F: block/nfs.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 
 SSH
 M: Richard W.M. Jones <[email protected]>
+M: Jeff Cody <[email protected]>
+L: [email protected]
 S: Supported
 F: block/ssh.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
 
 ARCHIPELAGO
-M: Chrysostomos Nanakos <[email protected]>
 M: Chrysostomos Nanakos <[email protected]>
+M: Jeff Cody <[email protected]>
+L: [email protected]
 S: Maintained
 F: block/archipelago.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+CURL
+M: Jeff Cody <[email protected]>
+L: [email protected]
+S: Supported
+F: block/curl.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+GLUSTER
+M: Jeff Cody <[email protected]>
+L: [email protected]
+S: Supported
+F: block/gluster.c
+T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+
+Null Block Driver
+M: Fam Zheng <[email protected]>
+L: [email protected]
+S: Supported
+F: block/null.c
 
 Bootdevice
 M: Gonglei <[email protected]>
 S: Maintained
 F: bootdevice.c
+
+Quorum
+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]>
+M: Denis V. Lunev <[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/
+
+
+Documentation
+-------------
+Build system architecture
+M: Daniel P. Berrange <[email protected]>
+S: Odd Fixes
+F: docs/build-system.txt