virtio-net-test: add large tx buffer test

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index aa1dd76dc2ccb4b9a0cfb09791a04fddf537022b..63effdc47397dbf01e50f82a6fb4b0cfbd221084 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12,9 +12,14 @@ consult qemu-devel and not any specific individual privately.
 Descriptions of section entries:
 
        M: Mail patches to: FullName <address@domain>
+          Maintainers are looking after a certain area and must be CCed on
+          patches. They are considered the main contact point.
        R: Designated reviewer: FullName <address@domain>
           These reviewers should be CCed on patches.
+          Reviewers are familiar with the subject matter and provide feedback
+          even though they are not maintainers.
        L: Mailing list that is relevant to this area
+          These lists should be CCed on patches.
        W: Web-page with status/info
        Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
@@ -74,7 +79,7 @@ S: Maintained
 L: [email protected]
 K: ^Subject:.*(?i)trivial
 T: git git://git.corpit.ru/qemu.git trivial-patches
-T: git git://github.com/vivier/qemu.git trivial-patches
+T: git https://github.com/vivier/qemu.git trivial-patches
 
 Architecture support
 --------------------
@@ -88,6 +93,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,21 +101,23 @@ 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
+T: git https://github.com/cohuck/qemu.git s390-next
 L: [email protected]
 
 Guest CPU cores (TCG):
 ----------------------
 Overall
 L: [email protected]
-M: Paolo Bonzini <[email protected]>
 M: Peter Crosthwaite <[email protected]>
 M: Richard Henderson <[email protected]>
+R: Paolo Bonzini <[email protected]>
 S: Maintained
 F: cpus.c
 F: exec.c
 F: accel/tcg/
+F: accel/stubs/tcg-stub.c
 F: include/exec/cpu*.h
 F: include/exec/exec-all.h
 F: include/exec/helper*.h
@@ -144,6 +152,13 @@ F: disas/arm.c
 F: disas/arm-a64.cc
 F: disas/libvixl/
 
+ARM SMMU
+M: Eric Auger <[email protected]>
+L: [email protected]
+S: Maintained
+F: hw/arm/smmu*
+F: include/hw/arm/smmu*
+
 CRIS
 M: Edgar E. Iglesias <[email protected]>
 S: Maintained
@@ -188,6 +203,7 @@ F: disas/microblaze.c
 MIPS
 M: Aurelien Jarno <[email protected]>
 M: Aleksandar Markovic <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: target/mips/
 F: hw/mips/
@@ -200,6 +216,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]>
@@ -226,7 +244,6 @@ F: tests/tcg/openrisc/
 
 PowerPC
 M: David Gibson <[email protected]>
-M: Alexander Graf <[email protected]>
 L: [email protected]
 S: Maintained
 F: target/ppc/
@@ -237,8 +254,10 @@ F: disas/ppc.c
 RISC-V
 M: Michael Clark <[email protected]>
 M: Palmer Dabbelt <[email protected]>
+M: Alistair Francis <[email protected]>
 M: Sagar Karandikar <[email protected]>
 M: Bastian Koppelmann <[email protected]>
+L: [email protected]
 S: Maintained
 F: target/riscv/
 F: hw/riscv/
@@ -247,7 +266,6 @@ F: disas/riscv.c
 
 S390
 M: Richard Henderson <[email protected]>
-M: Alexander Graf <[email protected]>
 M: David Hildenbrand <[email protected]>
 S: Maintained
 F: target/s390x/
@@ -291,7 +309,7 @@ F: tests/tcg/x86_64/
 F: hw/i386/
 F: disas/i386.c
 F: docs/qemu-cpu-models.texi
-T: git git://github.com/ehabkost/qemu.git x86-next
+T: git https://github.com/ehabkost/qemu.git x86-next
 
 Xtensa
 M: Max Filippov <[email protected]>
@@ -301,6 +319,8 @@ F: target/xtensa/
 F: hw/xtensa/
 F: tests/tcg/xtensa/
 F: disas/xtensa.c
+F: include/hw/xtensa/xtensa-isa.h
+F: default-configs/xtensa*.mak
 
 TriCore
 M: Bastian Koppelmann <[email protected]>
@@ -322,7 +342,10 @@ L: [email protected]
 S: Supported
 F: */kvm.*
 F: accel/kvm/
+F: accel/stubs/kvm-stub.c
+F: include/hw/kvm/
 F: include/sysemu/kvm*.h
+F: scripts/kvm/kvm_flightrecorder
 
 ARM
 M: Peter Maydell <[email protected]>
@@ -332,18 +355,18 @@ F: target/arm/kvm.c
 
 MIPS
 M: James Hogan <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: target/mips/kvm.c
 
 PPC
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 S: Maintained
 F: target/ppc/kvm.c
 
 S390
 M: Christian Borntraeger <[email protected]>
 M: Cornelia Huck <[email protected]>
-M: Alexander Graf <[email protected]>
 S: Maintained
 F: target/s390x/kvm.c
 F: target/s390x/kvm_s390x.h
@@ -355,8 +378,8 @@ F: hw/intc/s390_flic.c
 F: hw/intc/s390_flic_kvm.c
 F: include/hw/s390x/s390_flic.h
 F: gdb-xml/s390*.xml
-T: git git://github.com/cohuck/qemu.git s390-next
-T: git git://github.com/borntraeger/qemu.git s390-next
+T: git https://github.com/cohuck/qemu.git s390-next
+T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 X86
@@ -365,6 +388,7 @@ M: Marcelo Tosatti <[email protected]>
 L: [email protected]
 S: Supported
 F: target/i386/kvm.c
+F: scripts/kvm/vmxcap
 
 Guest CPU Cores (Xen):
 ----------------------
@@ -432,8 +456,9 @@ ARM Machines
 ------------
 Allwinner-a10
 M: Beniamino Galvani <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/*/allwinner*
 F: include/hw/*/allwinner*
 F: hw/arm/cubieboard.c
@@ -492,40 +517,57 @@ F: tests/test-arm-mptimer.c
 
 Exynos
 M: Igor Mitsyanko <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/*/exynos*
 F: include/hw/arm/exynos4210.h
 
 Calxeda Highbank
 M: Rob Herring <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/arm/highbank.c
 F: hw/net/xgmac.c
 
 Canon DIGIC
 M: Antony Pavlov <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: include/hw/arm/digic.h
 F: hw/*/digic*
 
 Gumstix
-M: Philippe Mathieu-Daudé <[email protected]>
+M: Peter Maydell <[email protected]>
+R: Philippe Mathieu-Daudé <[email protected]>
 L: [email protected]
 L: [email protected]
 S: Odd Fixes
 F: hw/arm/gumstix.c
 
-i.MX31
+i.MX25 PDK
+M: Peter Maydell <[email protected]>
+R: Jean-Christophe Dubois <[email protected]>
+L: [email protected]
+S: Odd Fixes
+F: hw/arm/fsl-imx25.c
+F: hw/arm/imx25_pdk.c
+F: hw/misc/imx25_ccm.c
+F: include/hw/arm/fsl-imx25.h
+F: include/hw/misc/imx25_ccm.h
+
+i.MX31 (kzm)
 M: Peter Chubb <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Odd fixes
-F: hw/*/imx*
-F: include/hw/*/imx*
+S: Odd Fixes
 F: hw/arm/kzm.c
-F: include/hw/arm/fsl-imx31.h
+F: hw/*/imx_*
+F: hw/*/*imx31*
+F: include/hw/*/imx_*
+F: include/hw/*/*imx31*
 
 Integrator CP
 M: Peter Maydell <[email protected]>
@@ -534,6 +576,28 @@ S: Maintained
 F: hw/arm/integratorcp.c
 F: hw/misc/arm_integrator_debug.c
 
+MCIMX6UL EVK / i.MX6ul
+M: Peter Maydell <[email protected]>
+R: Jean-Christophe Dubois <[email protected]>
+L: [email protected]
+S: Odd Fixes
+F: hw/arm/mcimx6ul-evk.c
+F: hw/arm/fsl-imx6ul.c
+F: hw/misc/imx6ul_ccm.c
+F: include/hw/arm/fsl-imx6ul.h
+F: include/hw/misc/imx6ul_ccm.h
+
+MCIMX7D SABRE / i.MX7
+M: Peter Maydell <[email protected]>
+R: Andrey Smirnov <[email protected]>
+L: [email protected]
+S: Odd Fixes
+F: hw/arm/mcimx7d-sabre.c
+F: hw/arm/fsl-imx7.c
+F: include/hw/arm/fsl-imx7.h
+F: hw/pci-host/designware.c
+F: include/hw/pci-host/designware.h
+
 MPS2
 M: Peter Maydell <[email protected]>
 L: [email protected]
@@ -551,22 +615,37 @@ F: include/hw/misc/iotkit-sysinfo.h
 
 Musicpal
 M: Jan Kiszka <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/arm/musicpal.c
 
 nSeries
 M: Andrzej Zaborowski <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/arm/nseries.c
 
 Palm
 M: Andrzej Zaborowski <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/arm/palm.c
 
+Raspberry Pi
+M: Peter Maydell <[email protected]>
+R: Andrew Baumann <[email protected]>
+R: Philippe Mathieu-Daudé <[email protected]>
+L: [email protected]
+S: Odd Fixes
+F: hw/arm/raspi.c
+F: hw/arm/raspi_platform.h
+F: hw/*/bcm283*
+F: include/hw/arm/raspi*
+F: include/hw/*/bcm283*
+
 Real View
 M: Peter Maydell <[email protected]>
 L: [email protected]
@@ -578,15 +657,40 @@ F: include/hw/intc/realview_gic.h
 
 PXA2XX
 M: Andrzej Zaborowski <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/arm/mainstone.c
 F: hw/arm/spitz.c
 F: hw/arm/tosa.c
 F: hw/arm/z2.c
 F: hw/*/pxa2xx*
+F: hw/display/tc6393xb.c
+F: hw/gpio/max7310.c
+F: hw/gpio/zaurus.c
 F: hw/misc/mst_fpga.c
 F: include/hw/arm/pxa.h
+F: include/hw/arm/sharpsl.h
+
+SABRELITE / i.MX6
+M: Peter Maydell <[email protected]>
+R: Jean-Christophe Dubois <[email protected]>
+L: [email protected]
+S: Odd Fixes
+F: hw/arm/sabrelite.c
+F: hw/arm/fsl-imx6.c
+F: hw/misc/imx6_src.c
+F: hw/ssi/imx_spi.c
+F: include/hw/arm/fsl-imx6.h
+F: include/hw/misc/imx6_src.h
+F: include/hw/ssi/imx_spi.h
+
+Sharp SL-5500 (Collie) PDA
+M: Peter Maydell <[email protected]>
+L: [email protected]
+S: Odd Fixes
+F: hw/arm/collie.c
+F: hw/arm/strongarm*
 
 Stellaris
 M: Peter Maydell <[email protected]>
@@ -594,6 +698,12 @@ L: [email protected]
 S: Maintained
 F: hw/*/stellaris*
 
+Versatile Express
+M: Peter Maydell <[email protected]>
+L: [email protected]
+S: Maintained
+F: hw/arm/vexpress.c
+
 Versatile PB
 M: Peter Maydell <[email protected]>
 L: [email protected]
@@ -601,9 +711,17 @@ S: Maintained
 F: hw/*/versatile*
 F: hw/misc/arm_sysctl.c
 
+Virt
+M: Peter Maydell <[email protected]>
+L: [email protected]
+S: Maintained
+F: hw/arm/virt*
+F: include/hw/arm/virt.h
+
 Xilinx Zynq
 M: Edgar E. Iglesias <[email protected]>
 M: Alistair Francis <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
 S: Maintained
 F: hw/*/xilinx_*
@@ -615,13 +733,13 @@ X: hw/ssi/xilinx_*
 Xilinx ZynqMP
 M: Alistair Francis <[email protected]>
 M: Edgar E. Iglesias <[email protected]>
+M: Peter Maydell <[email protected]>
 L: [email protected]
 S: Maintained
 F: hw/*/xlnx*.c
 F: include/hw/*/xlnx*.h
 
 ARM ACPI Subsystem
-M: Shannon Zhao <[email protected]>
 M: Shannon Zhao <[email protected]>
 L: [email protected]
 S: Maintained
@@ -629,6 +747,7 @@ F: hw/arm/virt-acpi-build.c
 
 STM32F205
 M: Alistair Francis <[email protected]>
+M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/arm/stm32f205_soc.c
 F: hw/misc/stm32f2xx_syscfg.c
@@ -640,11 +759,13 @@ F: include/hw/*/stm32*.h
 
 Netduino 2
 M: Alistair Francis <[email protected]>
+M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/arm/netduino2.c
 
 SmartFusion2
 M: Subbaraya Sundeep <[email protected]>
+M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/arm/msf2-soc.c
 F: hw/misc/msf2-sysreg.c
@@ -657,11 +778,13 @@ F: include/hw/ssi/mss-spi.h
 
 Emcraft M2S-FG484
 M: Subbaraya Sundeep <[email protected]>
+M: Peter Maydell <[email protected]>
 S: Maintained
 F: hw/arm/msf2-som.c
 
 ASPEED BMCs
 M: Cédric Le Goater <[email protected]>
+M: Peter Maydell <[email protected]>
 R: Andrew Jeffery <[email protected]>
 R: Joel Stanley <[email protected]>
 L: [email protected]
@@ -671,6 +794,15 @@ F: include/hw/*/*aspeed*
 F: hw/net/ftgmac100.c
 F: include/hw/net/ftgmac100.h
 
+NRF51
+M: Joel Stanley <[email protected]>
+M: Peter Maydell <[email protected]>
+L: [email protected]
+S: Maintained
+F: hw/arm/nrf51_soc.c
+F: hw/arm/microbit.c
+F: include/hw/arm/nrf51_soc.h
+
 CRIS Machines
 -------------
 Axis Dev88
@@ -724,27 +856,32 @@ MIPS Machines
 -------------
 Jazz
 M: Hervé Poussineau <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: hw/mips/mips_jazz.c
 
 Malta
 M: Aurelien Jarno <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: hw/mips/mips_malta.c
 
 Mipssim
 M: Aleksandar Markovic <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Odd Fixes
 F: hw/mips/mips_mipssim.c
 F: hw/net/mipsnet.c
 
 R4000
 M: Aurelien Jarno <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: hw/mips/mips_r4k.c
 
 Fulong 2E
 M: Aleksandar Markovic <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Odd Fixes
 F: hw/mips/mips_fulong2e.c
 F: hw/isa/vt82c686.c
@@ -753,6 +890,7 @@ F: include/hw/isa/vt82c686.h
 
 Boston
 M: Paul Burton <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: hw/core/loader-fit.c
 F: hw/mips/boston.c
@@ -768,21 +906,21 @@ F: hw/openrisc/openrisc_sim.c
 PowerPC Machines
 ----------------
 405
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
 S: Odd Fixes
 F: hw/ppc/ppc405_boards.c
 
 Bamboo
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
 S: Odd Fixes
 F: hw/ppc/ppc440_bamboo.c
 
 e500
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
-S: Supported
+S: Odd Fixes
 F: hw/ppc/e500.[hc]
 F: hw/ppc/e500plat.c
 F: include/hw/ppc/ppc_e500.h
@@ -790,16 +928,16 @@ F: include/hw/pci-host/ppce500.h
 F: pc-bios/u-boot.e500
 
 mpc8544ds
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
-S: Supported
+S: Odd Fixes
 F: hw/ppc/mpc8544ds.c
 F: hw/ppc/mpc8544_guts.c
 
 New World
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/ppc/mac_newworld.c
 F: hw/pci-host/uninorth.c
 F: hw/pci-bridge/dec.[hc]
@@ -811,9 +949,9 @@ F: include/hw/misc/mos6522.h
 F: include/hw/ppc/mac_dbdma.h
 
 Old World
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
-S: Maintained
+S: Odd Fixes
 F: hw/ppc/mac_oldworld.c
 F: hw/pci-host/grackle.c
 F: hw/misc/macio/
@@ -838,7 +976,6 @@ F: pc-bios/ppc_rom.bin
 
 sPAPR
 M: David Gibson <[email protected]>
-M: Alexander Graf <[email protected]>
 L: [email protected]
 S: Supported
 F: hw/*/spapr*
@@ -889,12 +1026,11 @@ Sun4m
 M: Mark Cave-Ayland <[email protected]>
 S: Maintained
 F: hw/sparc/sun4m.c
+F: hw/sparc/sun4m_iommu.c
 F: hw/dma/sparc32_dma.c
-F: hw/dma/sun4m_iommu.c
 F: hw/misc/eccmemctl.c
 F: hw/misc/slavio_misc.c
 F: include/hw/sparc/sparc32_dma.h
-F: include/hw/sparc/sun4m.h
 F: pc-bios/openbios-sparc32
 
 Sun4u
@@ -922,7 +1058,6 @@ S390 Machines
 S390 Virtio-ccw
 M: Cornelia Huck <[email protected]>
 M: Christian Borntraeger <[email protected]>
-M: Alexander Graf <[email protected]>
 S: Supported
 F: hw/char/sclp*.[hc]
 F: hw/char/terminal3270.c
@@ -931,17 +1066,24 @@ F: include/hw/s390x/
 F: hw/watchdog/wdt_diag288.c
 F: include/hw/watchdog/wdt_diag288.h
 F: default-configs/s390x-softmmu.mak
-T: git git://github.com/cohuck/qemu.git s390-next
-T: git git://github.com/borntraeger/qemu.git s390-next
+T: git https://github.com/cohuck/qemu.git s390-next
+T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
-S390-ccw Bios
+S390-ccw boot
 M: Christian Borntraeger <[email protected]>
 M: Thomas Huth <[email protected]>
 S: Supported
+F: hw/s390x/ipl.*
 F: pc-bios/s390-ccw/
 F: pc-bios/s390-ccw.img
-T: git git://github.com/borntraeger/qemu.git s390-next
+T: git https://github.com/borntraeger/qemu.git s390-next
+L: [email protected]
+
+S390 PCI
+M: Collin Walling <[email protected]>
+S: Supported
+F: hw/s390x/s390-pci*
 L: [email protected]
 
 UniCore32 Machines
@@ -1011,7 +1153,7 @@ S: Supported
 F: hw/core/machine.c
 F: hw/core/null-machine.c
 F: include/hw/boards.h
-T: git git://github.com/ehabkost/qemu.git machine-next
+T: git https://github.com/ehabkost/qemu.git machine-next
 
 Xtensa Machines
 ---------------
@@ -1047,7 +1189,7 @@ F: tests/ide-test.c
 F: tests/ahci-test.c
 F: tests/cdrom-test.c
 F: tests/libqos/ahci*
-T: git git://github.com/jnsnow/qemu.git ide
+T: git https://github.com/jnsnow/qemu.git ide
 
 IPMI
 M: Corey Minyard <[email protected]>
@@ -1056,7 +1198,7 @@ F: include/hw/ipmi/*
 F: hw/ipmi/*
 F: hw/smbios/smbios_type_38.c
 F: tests/ipmi*
-T: git git://github.com/cminyard/qemu.git master-ipmi-rebase
+T: git https://github.com/cminyard/qemu.git master-ipmi-rebase
 
 Floppy
 M: John Snow <[email protected]>
@@ -1065,7 +1207,7 @@ 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
+T: git https://github.com/jnsnow/qemu.git ide
 
 OMAP
 M: Peter Maydell <[email protected]>
@@ -1104,9 +1246,11 @@ F: hw/i386/acpi-build.[hc]
 F: hw/arm/virt-acpi-build.c
 F: tests/bios-tables-test.c
 F: tests/acpi-utils.[hc]
+F: tests/acpi-test-data/*
+F: tests/acpi-test-data/*/*
 
 ppc4xx
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
 S: Odd Fixes
 F: hw/ppc/ppc4*.c
@@ -1115,15 +1259,16 @@ F: include/hw/ppc/ppc4xx.h
 F: include/hw/i2c/ppc4xx_i2c.h
 
 ppce500
-M: Alexander Graf <[email protected]>
+M: David Gibson <[email protected]>
 L: [email protected]
-S: Supported
+S: Odd Fixes
 F: hw/ppc/e500*
 F: hw/pci-host/ppce500.c
 F: hw/net/fsl_etsec/
 
 Character devices
-M: Paolo Bonzini <[email protected]>
+M: Marc-André Lureau <[email protected]>
+R: Paolo Bonzini <[email protected]>
 S: Odd Fixes
 F: hw/char/
 
@@ -1133,7 +1278,7 @@ S: Odd Fixes
 F: hw/net/
 F: include/hw/net/
 F: tests/virtio-net-test.c
-T: git git://github.com/jasowang/qemu.git net
+T: git https://github.com/jasowang/qemu.git net
 
 SCSI
 M: Paolo Bonzini <[email protected]>
@@ -1142,7 +1287,7 @@ S: Supported
 F: include/hw/scsi/*
 F: hw/scsi/*
 F: tests/virtio-scsi-test.c
-T: git git://github.com/bonzini/qemu.git scsi-next
+T: git https://github.com/bonzini/qemu.git scsi-next
 
 SSI
 M: Peter Crosthwaite <[email protected]>
@@ -1193,11 +1338,27 @@ F: include/hw/vfio/
 
 vfio-ccw
 M: Cornelia Huck <[email protected]>
+M: Eric Farman <[email protected]>
+M: Farhan Ali <[email protected]>
 S: Supported
 F: hw/vfio/ccw.c
 F: hw/s390x/s390-ccw.c
 F: include/hw/s390x/s390-ccw.h
-T: git git://github.com/cohuck/qemu.git s390-next
+T: git https://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
@@ -1222,7 +1383,7 @@ S: Supported
 F: hw/9pfs/
 F: fsdev/
 F: tests/virtio-9p-test.c
-T: git git://github.com/gkurz/qemu.git 9p-next
+T: git https://github.com/gkurz/qemu.git 9p-next
 
 virtio-blk
 M: Stefan Hajnoczi <[email protected]>
@@ -1231,16 +1392,16 @@ S: Supported
 F: hw/block/virtio-blk.c
 F: hw/block/dataplane/*
 F: tests/virtio-blk-test.c
-T: git git://github.com/stefanha/qemu.git block
+T: git https://github.com/stefanha/qemu.git block
 
 virtio-ccw
 M: Cornelia Huck <[email protected]>
-M: Christian Borntraeger <borntraeger@de.ibm.com>
+M: Halil Pasic <pasic@linux.ibm.com>
 S: Supported
 F: hw/s390x/virtio-ccw*.[hc]
 F: hw/s390x/vhost-vsock-ccw.c
-T: git git://github.com/cohuck/qemu.git s390-next
-T: git git://github.com/borntraeger/qemu.git s390-next
+T: git https://github.com/cohuck/qemu.git s390-next
+T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 virtio-input
@@ -1344,7 +1505,7 @@ Intel Hexadecimal Object File Loader
 M: Su Hang <[email protected]>
 S: Maintained
 F: tests/hexloader-test.c
-F: tests/hex-loader-check-data/test.hex
+F: tests/data/hex-loader/test.hex
 
 CHRP NVRAM
 M: Thomas Huth <[email protected]>
@@ -1396,6 +1557,26 @@ 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
+
+Firmware configuration (fw_cfg)
+M: Philippe Mathieu-Daudé <[email protected]>
+R: Laszlo Ersek <[email protected]>
+R: Gerd Hoffmann <[email protected]>
+S: Supported
+F: docs/specs/fw_cfg.txt
+F: hw/nvram/fw_cfg.c
+F: include/hw/nvram/fw_cfg.h
+F: include/standard-headers/linux/qemu_fw_cfg.h
+F: tests/libqos/fw_cfg.c
+F: tests/fw_cfg-test.c
+T: git https://github.com/philmd/qemu.git fw_cfg-next
+
 Subsystems
 ----------
 Audio
@@ -1422,8 +1603,8 @@ F: qemu-io*
 F: tests/qemu-iotests/
 F: util/qemu-progress.c
 F: qobject/block-qdict.c
-F: test/check-block-qdict.c
-T: git git://repo.or.cz/qemu/kevin.git block
+F: tests/check-block-qdict.c
+T: git https://repo.or.cz/qemu/kevin.git block
 
 Block I/O path
 M: Stefan Hajnoczi <[email protected]>
@@ -1437,7 +1618,7 @@ F: migration/block*
 F: include/block/aio.h
 F: include/block/aio-wait.h
 F: scripts/qemugdb/aio.py
-T: git git://github.com/stefanha/qemu.git block
+T: git https://github.com/stefanha/qemu.git block
 
 Block SCSI subsystem
 M: Paolo Bonzini <[email protected]>
@@ -1455,13 +1636,13 @@ F: blockjob.c
 F: include/block/blockjob.h
 F: job.c
 F: job-qmp.c
-F: include/block/job.h
+F: include/qemu/job.h
 F: block/backup.c
 F: block/commit.c
 F: block/stream.c
 F: block/mirror.c
 F: qapi/job.json
-T: git git://github.com/codyprime/qemu-kvm-jtc.git block
+T: git https://github.com/codyprime/qemu-kvm-jtc.git block
 
 Block QAPI, monitor, command line
 M: Markus Armbruster <[email protected]>
@@ -1470,7 +1651,7 @@ F: blockdev.c
 F: block/qapi.c
 F: qapi/block*.json
 F: qapi/transaction.json
-T: git git://repo.or.cz/qemu/armbru.git block-next
+T: git https://repo.or.cz/qemu/armbru.git block-next
 
 Dirty Bitmaps
 M: Fam Zheng <[email protected]>
@@ -1483,12 +1664,12 @@ F: include/qemu/hbitmap.h
 F: include/block/dirty-bitmap.h
 F: tests/test-hbitmap.c
 F: docs/interop/bitmaps.rst
-T: git git://github.com/famz/qemu.git bitmaps
-T: git git://github.com/jnsnow/qemu.git bitmaps
+T: git https://github.com/famz/qemu.git bitmaps
+T: git https://github.com/jnsnow/qemu.git bitmaps
 
 Character device backends
-M: Paolo Bonzini <[email protected]>
 M: Marc-André Lureau <[email protected]>
+R: Paolo Bonzini <[email protected]>
 S: Maintained
 F: chardev/
 F: include/chardev/
@@ -1608,7 +1789,7 @@ M: Jason Wang <[email protected]>
 S: Maintained
 F: net/
 F: include/net/
-T: git git://github.com/jasowang/qemu.git net
+T: git https://github.com/jasowang/qemu.git net
 F: qapi/net.json
 
 Netmap network backend
@@ -1624,7 +1805,7 @@ M: Eduardo Habkost <[email protected]>
 S: Maintained
 F: numa.c
 F: include/sysemu/numa.h
-T: git git://github.com/ehabkost/qemu.git machine-next
+T: git https://github.com/ehabkost/qemu.git machine-next
 
 Host Memory Backends
 M: Eduardo Habkost <[email protected]>
@@ -1632,7 +1813,7 @@ M: Igor Mammedov <[email protected]>
 S: Maintained
 F: backends/hostmem*.c
 F: include/sysemu/hostmem.h
-T: git git://github.com/ehabkost/qemu.git machine-next
+T: git https://github.com/ehabkost/qemu.git machine-next
 
 Cryptodev Backends
 M: Gonglei <[email protected]>
@@ -1665,15 +1846,14 @@ F: tests/test-visitor-serialization.c
 F: scripts/qapi-gen.py
 F: scripts/qapi/*
 F: docs/devel/qapi*
-T: git git://repo.or.cz/qemu/armbru.git qapi-next
+T: git https://repo.or.cz/qemu/armbru.git qapi-next
 
 QAPI Schema
 M: Eric Blake <[email protected]>
 M: Markus Armbruster <[email protected]>
 S: Supported
-F: qapi-schema.json
 F: qapi/*.json
-T: git git://repo.or.cz/qemu/armbru.git qapi-next
+T: git https://repo.or.cz/qemu/armbru.git qapi-next
 
 QObject
 M: Markus Armbruster <[email protected]>
@@ -1687,7 +1867,7 @@ F: tests/check-qnum.c
 F: tests/check-qjson.c
 F: tests/check-qlist.c
 F: tests/check-qstring.c
-T: git git://repo.or.cz/qemu/armbru.git qapi-next
+T: git https://repo.or.cz/qemu/armbru.git qapi-next
 
 QEMU Guest Agent
 M: Michael Roth <[email protected]>
@@ -1697,12 +1877,12 @@ F: qemu-ga.texi
 F: scripts/qemu-guest-agent/
 F: tests/test-qga.c
 F: docs/interop/qemu-ga-ref.texi
-T: git git://github.com/mdroth/qemu.git qga
+T: git https://github.com/mdroth/qemu.git qga
 
 QOM
 M: Andreas Färber <[email protected]>
 S: Supported
-T: git git://github.com/afaerber/qemu-cpu.git qom-next
+T: git https://github.com/afaerber/qemu-cpu.git qom-next
 F: include/qom/
 X: include/qom/cpu.h
 F: qom/
@@ -1719,12 +1899,12 @@ F: docs/devel/*qmp-*
 F: scripts/qmp/
 F: tests/qmp-test.c
 F: tests/qmp-cmd-test.c
-T: git git://repo.or.cz/qemu/armbru.git qapi-next
+T: git https://repo.or.cz/qemu/armbru.git qapi-next
 
 qtest
-M: Paolo Bonzini <[email protected]>
 M: Thomas Huth <[email protected]>
 M: Laurent Vivier <[email protected]>
+R: Paolo Bonzini <[email protected]>
 S: Maintained
 F: qtest.c
 F: tests/libqtest.*
@@ -1762,10 +1942,10 @@ F: qemu-option-trace.texi
 F: scripts/tracetool.py
 F: scripts/tracetool/
 F: docs/devel/tracing.txt
-T: git git://github.com/stefanha/qemu.git tracing
+T: git https://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
@@ -1775,7 +1955,7 @@ F: include/sysemu/tpm*
 F: qapi/tpm.json
 F: backends/tpm.c
 F: tests/*tpm*
-T: git git://github.com/stefanberger/qemu-tpm.git tpm-next
+T: git https://github.com/stefanberger/qemu-tpm.git tpm-next
 
 Checkpatch
 S: Odd Fixes
@@ -1790,7 +1970,7 @@ F: migration/
 F: scripts/vmstate-static-checker.py
 F: tests/vmstate-static-checker-data/
 F: tests/migration-test.c
-F: docs/devel/migration.txt
+F: docs/devel/migration.rst
 F: qapi/migration.json
 
 Seccomp
@@ -1831,7 +2011,6 @@ F: tests/test-io-*
 Sockets
 M: Daniel P. Berrange <[email protected]>
 M: Gerd Hoffmann <[email protected]>
-M: Paolo Bonzini <[email protected]>
 S: Maintained
 F: include/qemu/sockets.h
 F: util/qemu-sockets.c
@@ -1890,6 +2069,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
@@ -1942,6 +2126,7 @@ F: disas/i386.c
 
 MIPS target
 M: Aurelien Jarno <[email protected]>
+R: Stefan Markovic <[email protected]>
 S: Maintained
 F: tcg/mips/
 F: disas/mips.c
@@ -1953,7 +2138,6 @@ F: tcg/ppc/
 F: disas/ppc.c
 
 S390 target
-M: Alexander Graf <[email protected]>
 M: Richard Henderson <[email protected]>
 S: Maintained
 F: tcg/s390/
@@ -1986,24 +2170,22 @@ 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
+T: git https://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
+T: git https://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
+T: git https://github.com/codyprime/qemu-kvm-jtc.git block
 
 VDI
 M: Stefan Weil <[email protected]>
@@ -2016,13 +2198,12 @@ M: Ronnie Sahlberg <[email protected]>
 M: Paolo Bonzini <[email protected]>
 M: Peter Lieven <[email protected]>
 L: [email protected]
-S: Supported
+S: Odd Fixes
 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*
@@ -2031,7 +2212,7 @@ F: include/block/nbd*
 F: qemu-nbd.*
 F: blockdev-nbd.c
 F: docs/interop/nbd.txt
-T: git git://repo.or.cz/qemu/ericb.git nbd
+T: git https://repo.or.cz/qemu/ericb.git nbd
 
 NFS
 M: Jeff Cody <[email protected]>
@@ -2039,7 +2220,7 @@ 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
+T: git https://github.com/codyprime/qemu-kvm-jtc.git block
 
 SSH
 M: Richard W.M. Jones <[email protected]>
@@ -2047,21 +2228,21 @@ 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
+T: git https://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
+T: git https://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
+T: git https://github.com/codyprime/qemu-kvm-jtc.git block
 
 Null Block Driver
 M: Fam Zheng <[email protected]>