| Message ID | 1372070972-30776-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 6e481d5754a3ff4170e995f6ea0d2f73c55ab072 |
| Headers | show |
On Mon, Jun 24, 2013 at 11:49:32AM +0100, Peter Maydell wrote: > 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 Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > 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 <edgar.iglesias@gmail.com> > S: Maintained > F: hw/cris/axis_dev88.c > - > -etraxfs > -M: Edgar E. Iglesias <edgar.iglesias@gmail.com> > -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 <edgar.iglesias@gmail.com> > S: Maintained > -F: hw/microblaze/petalogix_s3adsp1800.c > +F: hw/microblaze/petalogix_s3adsp1800_mmu.c > > petalogix_ml605 > M: Peter Crosthwaite <peter.crosthwaite@petalogix.com> > @@ -407,8 +403,8 @@ M: Alexander Graf <agraf@suse.de> > L: qemu-ppc@nongnu.org > 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 <agraf@suse.de> > L: qemu-ppc@nongnu.org > 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 <andreas.faerber@web.de> > L: qemu-ppc@nongnu.org > 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 <edgar.iglesias@gmail.com> > L: qemu-ppc@nongnu.org > S: Odd Fixes > -F: hw/pci/virtex_ml507.c > +F: hw/ppc/virtex_ml507.c > > SH4 Machines > ------------ > R2D > M: Magnus Damm <magnus.damm@gmail.com> > S: Maintained > -F: hw/sh/r2d.c > +F: hw/sh4/r2d.c > > Shix > M: Magnus Damm <magnus.damm@gmail.com> > 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 <agraf@suse.de> > S: Maintained > -F: hw/s390/s390-*.c > +F: hw/s390x/s390-*.c > > S390 Virtio-ccw > M: Cornelia Huck <cornelia.huck@de.ibm.com> > @@ -544,7 +540,7 @@ M: Alexander Graf <agraf@suse.de> > M: Scott Wood <scottwood@freescale.com> > L: qemu-ppc@nongnu.org > S: Supported > -F: hw/ppc/e500_* > +F: hw/ppc/e500* > > SCSI > M: Paolo Bonzini <pbonzini@redhat.com> > @@ -572,7 +568,7 @@ F: hw/usb/* > VFIO > M: Alex Williamson <alex.williamson@redhat.com> > S: Supported > -F: hw/pci/vfio.c > +F: hw/misc/vfio.c > > vhost > M: Michael S. Tsirkin <mst@redhat.com> > @@ -646,7 +642,7 @@ CPU > M: Andreas Färber <afaerber@suse.de> > 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 <peter.crosthwaite@petalogix.com> > M: Alexander Graf <agraf@suse.de> > S: Maintained > -F: device-tree.[ch] > +F: device_tree.[ch] > > GDB stub > M: qemu-devel@nongnu.org > @@ -670,7 +666,7 @@ F: gdb-xml/ > SPICE > M: Gerd Hoffmann <kraxel@redhat.com> > 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 >
Ping! thanks -- PMM On 24 June 2013 11:49, Peter Maydell <peter.maydell@linaro.org> wrote: > 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 <peter.maydell@linaro.org> > --- > 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 <edgar.iglesias@gmail.com> > S: Maintained > F: hw/cris/axis_dev88.c > - > -etraxfs > -M: Edgar E. Iglesias <edgar.iglesias@gmail.com> > -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 <edgar.iglesias@gmail.com> > S: Maintained > -F: hw/microblaze/petalogix_s3adsp1800.c > +F: hw/microblaze/petalogix_s3adsp1800_mmu.c > > petalogix_ml605 > M: Peter Crosthwaite <peter.crosthwaite@petalogix.com> > @@ -407,8 +403,8 @@ M: Alexander Graf <agraf@suse.de> > L: qemu-ppc@nongnu.org > 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 <agraf@suse.de> > L: qemu-ppc@nongnu.org > 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 <andreas.faerber@web.de> > L: qemu-ppc@nongnu.org > 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 <edgar.iglesias@gmail.com> > L: qemu-ppc@nongnu.org > S: Odd Fixes > -F: hw/pci/virtex_ml507.c > +F: hw/ppc/virtex_ml507.c > > SH4 Machines > ------------ > R2D > M: Magnus Damm <magnus.damm@gmail.com> > S: Maintained > -F: hw/sh/r2d.c > +F: hw/sh4/r2d.c > > Shix > M: Magnus Damm <magnus.damm@gmail.com> > 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 <agraf@suse.de> > S: Maintained > -F: hw/s390/s390-*.c > +F: hw/s390x/s390-*.c > > S390 Virtio-ccw > M: Cornelia Huck <cornelia.huck@de.ibm.com> > @@ -544,7 +540,7 @@ M: Alexander Graf <agraf@suse.de> > M: Scott Wood <scottwood@freescale.com> > L: qemu-ppc@nongnu.org > S: Supported > -F: hw/ppc/e500_* > +F: hw/ppc/e500* > > SCSI > M: Paolo Bonzini <pbonzini@redhat.com> > @@ -572,7 +568,7 @@ F: hw/usb/* > VFIO > M: Alex Williamson <alex.williamson@redhat.com> > S: Supported > -F: hw/pci/vfio.c > +F: hw/misc/vfio.c > > vhost > M: Michael S. Tsirkin <mst@redhat.com> > @@ -646,7 +642,7 @@ CPU > M: Andreas Färber <afaerber@suse.de> > 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 <peter.crosthwaite@petalogix.com> > M: Alexander Graf <agraf@suse.de> > S: Maintained > -F: device-tree.[ch] > +F: device_tree.[ch] > > GDB stub > M: qemu-devel@nongnu.org > @@ -670,7 +666,7 @@ F: gdb-xml/ > SPICE > M: Gerd Hoffmann <kraxel@redhat.com> > 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 > >
On 07/02/2013 01:29 PM, Peter Maydell wrote: > Ping! Who are you pinging here? Alex > > thanks > -- PMM > > On 24 June 2013 11:49, Peter Maydell<peter.maydell@linaro.org> wrote: >> 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<peter.maydell@linaro.org> >> --- >> 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<edgar.iglesias@gmail.com> >> S: Maintained >> F: hw/cris/axis_dev88.c >> - >> -etraxfs >> -M: Edgar E. Iglesias<edgar.iglesias@gmail.com> >> -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<edgar.iglesias@gmail.com> >> S: Maintained >> -F: hw/microblaze/petalogix_s3adsp1800.c >> +F: hw/microblaze/petalogix_s3adsp1800_mmu.c >> >> petalogix_ml605 >> M: Peter Crosthwaite<peter.crosthwaite@petalogix.com> >> @@ -407,8 +403,8 @@ M: Alexander Graf<agraf@suse.de> >> L: qemu-ppc@nongnu.org >> 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<agraf@suse.de> >> L: qemu-ppc@nongnu.org >> 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<andreas.faerber@web.de> >> L: qemu-ppc@nongnu.org >> 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<edgar.iglesias@gmail.com> >> L: qemu-ppc@nongnu.org >> S: Odd Fixes >> -F: hw/pci/virtex_ml507.c >> +F: hw/ppc/virtex_ml507.c >> >> SH4 Machines >> ------------ >> R2D >> M: Magnus Damm<magnus.damm@gmail.com> >> S: Maintained >> -F: hw/sh/r2d.c >> +F: hw/sh4/r2d.c >> >> Shix >> M: Magnus Damm<magnus.damm@gmail.com> >> 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<agraf@suse.de> >> S: Maintained >> -F: hw/s390/s390-*.c >> +F: hw/s390x/s390-*.c >> >> S390 Virtio-ccw >> M: Cornelia Huck<cornelia.huck@de.ibm.com> >> @@ -544,7 +540,7 @@ M: Alexander Graf<agraf@suse.de> >> M: Scott Wood<scottwood@freescale.com> >> L: qemu-ppc@nongnu.org >> S: Supported >> -F: hw/ppc/e500_* >> +F: hw/ppc/e500* >> >> SCSI >> M: Paolo Bonzini<pbonzini@redhat.com> >> @@ -572,7 +568,7 @@ F: hw/usb/* >> VFIO >> M: Alex Williamson<alex.williamson@redhat.com> >> S: Supported >> -F: hw/pci/vfio.c >> +F: hw/misc/vfio.c >> >> vhost >> M: Michael S. Tsirkin<mst@redhat.com> >> @@ -646,7 +642,7 @@ CPU >> M: Andreas Färber<afaerber@suse.de> >> 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<peter.crosthwaite@petalogix.com> >> M: Alexander Graf<agraf@suse.de> >> S: Maintained >> -F: device-tree.[ch] >> +F: device_tree.[ch] >> >> GDB stub >> M: qemu-devel@nongnu.org >> @@ -670,7 +666,7 @@ F: gdb-xml/ >> SPICE >> M: Gerd Hoffmann<kraxel@redhat.com> >> 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 >> >>
On 2 July 2013 12:51, Alexander Graf <agraf@suse.de> wrote: > On 07/02/2013 01:29 PM, Peter Maydell wrote: >> Ping! > Who are you pinging here? Our nonexistent mechanism for dealing with patches to files which don't have an obvious maintainer :-) (I didn't realise I hadn't cc'd Anthony on the patch to start with.) -- PMM
Applied. Thanks. Regards, Anthony Liguori
diff --git a/MAINTAINERS b/MAINTAINERS index a015f68..b65d2f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -303,11 +303,7 @@ Axis Dev88 M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/cris/axis_dev88.c - -etraxfs -M: Edgar E. Iglesias <edgar.iglesias@gmail.com> -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 <edgar.iglesias@gmail.com> S: Maintained -F: hw/microblaze/petalogix_s3adsp1800.c +F: hw/microblaze/petalogix_s3adsp1800_mmu.c petalogix_ml605 M: Peter Crosthwaite <peter.crosthwaite@petalogix.com> @@ -407,8 +403,8 @@ M: Alexander Graf <agraf@suse.de> L: qemu-ppc@nongnu.org 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 <agraf@suse.de> L: qemu-ppc@nongnu.org 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 <andreas.faerber@web.de> L: qemu-ppc@nongnu.org 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 <edgar.iglesias@gmail.com> L: qemu-ppc@nongnu.org S: Odd Fixes -F: hw/pci/virtex_ml507.c +F: hw/ppc/virtex_ml507.c SH4 Machines ------------ R2D M: Magnus Damm <magnus.damm@gmail.com> S: Maintained -F: hw/sh/r2d.c +F: hw/sh4/r2d.c Shix M: Magnus Damm <magnus.damm@gmail.com> 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 <agraf@suse.de> S: Maintained -F: hw/s390/s390-*.c +F: hw/s390x/s390-*.c S390 Virtio-ccw M: Cornelia Huck <cornelia.huck@de.ibm.com> @@ -544,7 +540,7 @@ M: Alexander Graf <agraf@suse.de> M: Scott Wood <scottwood@freescale.com> L: qemu-ppc@nongnu.org S: Supported -F: hw/ppc/e500_* +F: hw/ppc/e500* SCSI M: Paolo Bonzini <pbonzini@redhat.com> @@ -572,7 +568,7 @@ F: hw/usb/* VFIO M: Alex Williamson <alex.williamson@redhat.com> S: Supported -F: hw/pci/vfio.c +F: hw/misc/vfio.c vhost M: Michael S. Tsirkin <mst@redhat.com> @@ -646,7 +642,7 @@ CPU M: Andreas Färber <afaerber@suse.de> 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 <peter.crosthwaite@petalogix.com> M: Alexander Graf <agraf@suse.de> S: Maintained -F: device-tree.[ch] +F: device_tree.[ch] GDB stub M: qemu-devel@nongnu.org @@ -670,7 +666,7 @@ F: gdb-xml/ SPICE M: Gerd Hoffmann <kraxel@redhat.com> 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*
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 <peter.maydell@linaro.org> --- MAINTAINERS | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)