hw/m68k: add Nubus support

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c56d45b1697577a62e262b28dca1b76f8e4404e..7892ab5f024b539eba7cbec1150f357792762f35 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -406,7 +406,7 @@ Guest CPU Cores (Xen)
 X86 Xen CPUs
 M: Stefano Stabellini <[email protected]>
 M: Anthony Perard <[email protected]>
-M: Paul Durrant <paul[email protected]>
+M: Paul Durrant <paul@xen.org>
 L: [email protected]
 S: Supported
 F: */xen*
@@ -917,6 +917,14 @@ F: hw/m68k/next-*.c
 F: hw/display/next-fb.c
 F: include/hw/m68k/next-cube.h
 
+q800
+M: Laurent Vivier <[email protected]>
+S: Maintained
+F: hw/misc/mac_via.c
+F: hw/nubus/*
+F: include/hw/misc/mac_via.h
+F: include/hw/nubus/*
+
 MicroBlaze Machines
 -------------------
 petalogix_s3adsp1800
@@ -1077,8 +1085,6 @@ F: hw/*/spapr*
 F: include/hw/*/spapr*
 F: hw/*/xics*
 F: include/hw/*/xics*
-F: pc-bios/spapr-rtas/*
-F: pc-bios/spapr-rtas.bin
 F: pc-bios/slof.bin
 F: docs/specs/ppc-spapr-hcalls.txt
 F: docs/specs/ppc-spapr-hotplug.txt
@@ -1206,7 +1212,7 @@ T: git https://github.com/borntraeger/qemu.git s390-next
 L: [email protected]
 
 S390 PCI
-M: Collin Walling <walling@linux.ibm.com>
+M: Matthew Rosato <mjrosato@linux.ibm.com>
 S: Supported
 F: hw/s390x/s390-pci*
 L: [email protected]
@@ -1302,6 +1308,11 @@ M: Max Filippov <[email protected]>
 S: Maintained
 F: hw/xtensa/sim.c
 
+virt
+M: Max Filippov <[email protected]>
+S: Maintained
+F: hw/xtensa/virt.c
+
 XTFPGA (LX60, LX200, ML605, KC705)
 M: Max Filippov <[email protected]>
 S: Maintained
@@ -1519,7 +1530,7 @@ F: tests/virtio-balloon-test.c
 
 virtio-9p
 M: Greg Kurz <[email protected]>
-S: Supported
+S: Odd Fixes
 F: hw/9pfs/
 X: hw/9pfs/xen-9p*
 F: fsdev/
@@ -1818,8 +1829,8 @@ F: qapi/transaction.json
 T: git https://repo.or.cz/qemu/armbru.git block-next
 
 Dirty Bitmaps
-M: Fam Zheng <[email protected]>
 M: John Snow <[email protected]>
+R: Vladimir Sementsov-Ogievskiy <[email protected]>
 L: [email protected]
 S: Supported
 F: util/hbitmap.c
@@ -1828,7 +1839,6 @@ F: include/qemu/hbitmap.h
 F: include/block/dirty-bitmap.h
 F: tests/test-hbitmap.c
 F: docs/interop/bitmaps.rst
-T: git https://github.com/famz/qemu.git bitmaps
 T: git https://github.com/jnsnow/qemu.git bitmaps
 
 Character device backends