This patch fixes a number of incorrect F: patterns which didn't
match any files in the source tree. This was caused by a mix
of minor typos (- for _ and the like) and a few entries which
hadn't been correctly updated following the rearrangement of hw/.
Offending entries were located with the following shell rune:
for pattern in $(sed -ne 's/^F: //p' MAINTAINERS); do
if ! stat --printf='' $pattern 2>/dev/null; then
echo bad pattern: $pattern
fi
done
Signed-off-by: Peter Maydell<address@hidden>
---
MAINTAINERS | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index a015f68..b65d2f7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -303,11 +303,7 @@ Axis Dev88
M: Edgar E. Iglesias<address@hidden>
S: Maintained
F: hw/cris/axis_dev88.c
-
-etraxfs
-M: Edgar E. Iglesias<address@hidden>
-S: Maintained
-F: hw/cris/etraxfs.c
+F: hw/*/etraxfs_*.c
LM32 Machines
-------------
@@ -343,7 +339,7 @@ MicroBlaze Machines
petalogix_s3adsp1800
M: Edgar E. Iglesias<address@hidden>
S: Maintained
-F: hw/microblaze/petalogix_s3adsp1800.c
+F: hw/microblaze/petalogix_s3adsp1800_mmu.c
petalogix_ml605
M: Peter Crosthwaite<address@hidden>
@@ -407,8 +403,8 @@ M: Alexander Graf<address@hidden>
L: address@hidden
S: Maintained
F: hw/ppc/mac_newworld.c
-F: hw/pci/devices/host-uninorth.c
-F: hw/pci/devices/host-dec.[hc]
+F: hw/pci-host/uninorth.c
+F: hw/pci-bridge/dec.[hc]
F: hw/misc/macio/
Old World
@@ -416,7 +412,7 @@ M: Alexander Graf<address@hidden>
L: address@hidden
S: Maintained
F: hw/ppc/mac_oldworld.c
-F: hw/pci/devices/host-grackle.c
+F: hw/pci-host/grackle.c
F: hw/misc/macio/
PReP
@@ -424,7 +420,7 @@ M: Andreas Färber<address@hidden>
L: address@hidden
S: Odd Fixes
F: hw/ppc/prep.c
-F: hw/pci/devices/host-prep.[hc]
+F: hw/pci-host/prep.[hc]
F: hw/isa/pc87312.[hc]
sPAPR
@@ -438,19 +434,19 @@ virtex_ml507
M: Edgar E. Iglesias<address@hidden>
L: address@hidden
S: Odd Fixes
-F: hw/pci/virtex_ml507.c
+F: hw/ppc/virtex_ml507.c
SH4 Machines
------------
R2D
M: Magnus Damm<address@hidden>
S: Maintained
-F: hw/sh/r2d.c
+F: hw/sh4/r2d.c
Shix
M: Magnus Damm<address@hidden>
S: Orphan
-F: hw/sh/shix.c
+F: hw/sh4/shix.c
SPARC Machines
--------------
@@ -475,7 +471,7 @@ S390 Machines
S390 Virtio
M: Alexander Graf<address@hidden>
S: Maintained
-F: hw/s390/s390-*.c
+F: hw/s390x/s390-*.c
S390 Virtio-ccw
M: Cornelia Huck<address@hidden>
@@ -544,7 +540,7 @@ M: Alexander Graf<address@hidden>
M: Scott Wood<address@hidden>
L: address@hidden
S: Supported
-F: hw/ppc/e500_*
+F: hw/ppc/e500*
SCSI
M: Paolo Bonzini<address@hidden>
@@ -572,7 +568,7 @@ F: hw/usb/*
VFIO
M: Alex Williamson<address@hidden>
S: Supported
-F: hw/pci/vfio.c
+F: hw/misc/vfio.c
vhost
M: Michael S. Tsirkin<address@hidden>
@@ -646,7 +642,7 @@ CPU
M: Andreas Färber<address@hidden>
S: Supported
F: qom/cpu.c
-F: include/qemu/cpu.h
+F: include/qom/cpu.h
F: target-i386/cpu.c
ICC Bus
@@ -659,7 +655,7 @@ Device Tree
M: Peter Crosthwaite<address@hidden>
M: Alexander Graf<address@hidden>
S: Maintained
-F: device-tree.[ch]
+F: device_tree.[ch]
GDB stub
M: address@hidden
@@ -670,7 +666,7 @@ F: gdb-xml/
SPICE
M: Gerd Hoffmann<address@hidden>
S: Supported
-F: ui/qemu-spice.h
+F: include/ui/qemu-spice.h
F: ui/spice-*.c
F: audio/spiceaudio.c
F: hw/display/qxl*
--
1.7.9.5