Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190924' into staging

[qemu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ef6c01084b73b82bb3b553ea8856a1adfd16edd5..bd7ee23101841345632737d72eb73feebe94d9ec 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*
@@ -910,6 +910,13 @@ F: hw/char/mcf_uart.c
 F: hw/net/mcf_fec.c
 F: include/hw/m68k/mcf*.h
 
+NeXTcube
+M: Thomas Huth <[email protected]>
+S: Odd Fixes
+F: hw/m68k/next-*.c
+F: hw/display/next-fb.c
+F: include/hw/m68k/next-cube.h
+
 MicroBlaze Machines
 -------------------
 petalogix_s3adsp1800
@@ -1547,7 +1554,8 @@ F: include/hw/virtio/virtio-input.h
 F: contrib/vhost-user-input/*
 
 virtio-serial
-M: Amit Shah <[email protected]>
+M: Laurent Vivier <[email protected]>
+R: Amit Shah <[email protected]>
 S: Supported
 F: hw/char/virtio-serial-bus.c
 F: hw/char/virtio-console.c
@@ -1556,7 +1564,8 @@ F: tests/virtio-console-test.c
 F: tests/virtio-serial-test.c
 
 virtio-rng
-M: Amit Shah <[email protected]>
+M: Laurent Vivier <[email protected]>
+R: Amit Shah <[email protected]>
 S: Supported
 F: hw/virtio/virtio-rng.c
 F: include/hw/virtio/virtio-rng.h
@@ -1890,6 +1899,7 @@ M: Paolo Bonzini <[email protected]>
 S: Supported
 F: include/exec/ioport.h
 F: ioport.c
+F: include/exec/memop.h
 F: include/exec/memory.h
 F: include/exec/ram_addr.h
 F: memory.c
@@ -2032,7 +2042,7 @@ QEMU Guest Agent
 M: Michael Roth <[email protected]>
 S: Maintained
 F: qga/
-F: qemu-ga.texi
+F: docs/interop/qemu-ga.rst
 F: scripts/qemu-guest-agent/
 F: tests/test-qga.c
 F: docs/interop/qemu-ga-ref.texi
@@ -2078,7 +2088,7 @@ R: Paolo Bonzini <[email protected]>
 S: Maintained
 F: qtest.c
 F: accel/qtest.c
-F: tests/libqtest.*
+F: tests/libqtest*
 F: tests/libqos/
 F: tests/*-test.c