win32: provide separate macros for weak decls and definitions

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 32d8dc761aa04c50261a5ddb10bcb4d41d89b62c..6d864c1ceb933d362a602c44d7c1942979b4a62b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -207,6 +207,12 @@ M: [email protected]
 S: Orphan
 F: hw/gumstix.c
 
+i.MX31
+M: Peter Chubb <[email protected]>
+S: Odd fixes
+F: hw/imx*
+F: hw/kzm.c
+
 Integrator CP
 M: Paul Brook <[email protected]>
 M: Peter Maydell <[email protected]>
@@ -311,6 +317,11 @@ M: Edgar E. Iglesias <[email protected]>
 S: Maintained
 F: hw/petalogix_s3adsp1800.c
 
+petalogix_ml605
+M: Peter Crosthwaite <[email protected]>
+S: Maintained
+F: hw/petalogix_ml605_mmu.c
+
 MIPS Machines
 -------------
 Jazz
@@ -394,12 +405,21 @@ M: Alexander Graf <[email protected]>
 S: Maintained
 F: hw/s390-*.c
 
+UniCore32 Machines
+-------------
+PKUnity-3 SoC initramfs-with-busybox
+M: Guan Xuetao <[email protected]>
+S: Maintained
+F: hw/puv3*
+F: hw/unicore32/
+
 X86 Machines
 ------------
 PC
 M: Anthony Liguori <[email protected]>
 S: Supported
-F: hw/pc.[ch] hw/pc_piix.c
+F: hw/pc.[ch]
+F: hw/pc_piix.c
 
 Xtensa Machines
 ---------------
@@ -436,7 +456,7 @@ M: Paolo Bonzini <[email protected]>
 S: Supported
 F: hw/virtio-scsi.*
 F: hw/scsi*
-T: git://github.com/bonzini/qemu.git scsi-next
+T: git git://github.com/bonzini/qemu.git scsi-next
 
 LSI53C895A
 M: Paul Brook <[email protected]>
@@ -461,9 +481,9 @@ F: hw/virtio*
 virtio-9p
 M: Aneesh Kumar K.V <[email protected]>
 S: Supported
-F: hw/9pfs/ fsdev/
-T: https://github.com/kvaneesh/QEMU
-
+F: hw/9pfs/
+F: fsdev/
+T: git git://github.com/kvaneesh/QEMU.git
 
 virtio-blk
 M: Kevin Wolf <[email protected]>
@@ -476,6 +496,17 @@ S: Supported
 F: hw/virtio-serial*
 F: hw/virtio-console*
 
+Xilinx EDK
+M: Peter Crosthwaite <[email protected]>
+M: Edgar E. Iglesias <[email protected]>
+S: Maintained
+F: hw/xilinx_axi*
+F: hw/xilinx_uartlite.c
+F: hw/xilinx_intc.c
+F: hw/xilinx_ethlite.c
+F: hw/xilinx_timer.c
+F: hw/xilinx.h
+
 Subsystems
 ----------
 Audio
@@ -494,6 +525,12 @@ M: Anthony Liguori <[email protected]>
 S: Maintained
 F: qemu-char.c
 
+Device Tree
+M: Peter Crosthwaite <[email protected]>
+M: Alexander Graf <[email protected]>
+S: Maintained
+F: device-tree.[ch]
+
 GDB stub
 M: [email protected]
 S: Odd Fixes
@@ -531,9 +568,10 @@ F: monitor.c
 
 Network device layer
 M: Anthony Liguori <[email protected]>
-M: Mark McLoughlin <markmc@redhat.com>
+M: Stefan Hajnoczi <stefanha@gmail.com>
 S: Maintained
 F: net/
+T: git git://github.com/stefanha/qemu.git net
 
 Network Block Device (NBD)
 M: Paolo Bonzini <[email protected]>
@@ -541,22 +579,22 @@ S: Odd Fixes
 F: block/nbd.c
 F: nbd.*
 F: qemu-nbd.c
-T: git://github.com/bonzini/qemu.git nbd-next
+T: git git://github.com/bonzini/qemu.git nbd-next
 
 SLIRP
 M: Jan Kiszka <[email protected]>
 S: Maintained
 F: slirp/
-T: git://git.kiszka.org/qemu.git queues/slirp
+T: git git://git.kiszka.org/qemu.git queues/slirp
 
 Tracing
-M: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
+M: Stefan Hajnoczi <stefanha@gmail.com>
 S: Maintained
 F: trace/
 F: scripts/tracetool.py
 F: scripts/tracetool/
 F: docs/tracing.txt
-T: git://github.com/stefanha/qemu.git tracing
+T: git git://github.com/stefanha/qemu.git tracing
 
 Checkpatch
 M: Blue Swirl <[email protected]>
@@ -570,11 +608,6 @@ M: Blue Swirl <[email protected]>
 S: Maintained
 F: bsd-user/
 
-Darwin user
-M: [email protected]
-S: Orphan
-F: darwin-user/
-
 Linux user
 M: Riku Voipio <[email protected]>
 S: Maintained
@@ -636,4 +669,26 @@ F: tcg/sparc/
 TCI target
 M: Stefan Weil <[email protected]>
 S: Maintained
-F: tcg/tci
+F: tcg/tci/
+
+Stable branches
+---------------
+Stable 1.0
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-1.0.git
+S: Orphan
+
+Stable 0.15
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-0.15.git
+S: Orphan
+
+Stable 0.14
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-0.14.git
+S: Orphan
+
+Stable 0.10
+L: [email protected]
+T: git git://git.qemu.org/qemu-stable-0.10.git
+S: Orphan