[PATCH 00/39] MAINTAINERS: Fix F: lines

[PATCH 00/39] MAINTAINERS: Fix F: lines

[Markus Armbruster]

Quite a few F: lines don't match any files.  The quick & dirty check

    $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null

finds about fifty.

Philippe Mathieu-Daudé recently posted a few fixes:

  MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
  MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
  MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
  MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
  MAINTAINERS: Cover python.docker with Python library section
  MAINTAINERS: Fix s390x storage key/attribute device paths
  MAINTAINERS: Fix tcg/s390x/ path
  MAINTAINERS: Correct scripts/coverity-model.c path
  MAINTAINERS: Fix hexagon-linux-user.mak path

These are in

   Subject: [PATCH 0/7] docker: Remove LegacyKeyValueFormat warnings
   Date: Mon, 18 May 2026 12:22:15 +0200
   Message-ID: <20260518102222.80735-1-philmd@linaro.org>

   Subject: [PATCH v2 0/4] buildsys: Stop checking for ESA/390 host
   Date: Tue, 19 May 2026 19:12:36 +0200
   Message-ID: <20260519171240.97420-1-philmd@linaro.org>


   Subject: [PATCH] MAINTAINERS: Correct scripts/coverity-model.c path
   Date: Tue, 19 May 2026 19:19:26 +0200
   Message-ID: <20260519171926.98099-1-philmd@linaro.org>

   Subject: [PATCH] MAINTAINERS: Fix hexagon-linux-user.mak path
   Date: Wed, 20 May 2026 14:39:47 +0200
   Message-ID: <20260520123947.12711-1-philmd@linaro.org>

This series takes care of the remainder, except for one discussed
below.  It applies cleanly with and without Philippe's patches.

The exception is the last line in

    Python scripts
    M: John Snow <jsnow@redhat.com>
    M: Cleber Rosa <crosa@redhat.com>
    S: Odd Fixes
    F: scripts/*.py
    F: tests/*.py

Both F: are actually wrong here: they match only in the scripts/ and
tests/ not further down.  Left for another day.

Markus Armbruster (39):
  MAINTAINERS: Improve another "Overall" section headline
  MAINTAINERS: Delete trailing colons in section headlines
  MAINTAINERS: Drop stale F: from "Guest CPU cores (TCG)"
  MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"
  MAINTAINERS: Drop stale F: in "SPARC TCG CPUs"
  MAINTAINERS: Drop stale F: from "Overall KVM CPUs"
  MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"
  MAINTAINERS: Drop stale F: from "virtio"
  MAINTAINERS: Fix F: in "Apple Silicon HVF CPUs"
  MAINTAINERS: Drop bad F: in "X86 Xen CPUs"
  MAINTAINERS: Fix F: in "WebAssembly"
  MAINTAINERS: Fix F: in "Allwinner-a10"
  MAINTAINERS: Fix F: in "Raspberry Pi"
  MAINTAINERS: Drop bad F: from "Xilinx Zynq"
  MAINTAINERS: Drop stale F: from "New World (mac99)"
  MAINTAINERS: Drop stale F: from "sPAPR (pseries)"
  MAINTAINERS: Fix F: typo in "sam460ex"
  MAINTAINERS: Fix F: in "SiFive Machines"
  MAINTAINERS: Fix F: typo in "ACPI/HEST/GHES/ARM processor CPER"
  MAINTAINERS: Fix F: in "SSI"
  MAINTAINERS: Fix F: in "vhost"
  MAINTAINERS: Fix F: in "virtio-input"
  MAINTAINERS: Fix bad / stale F: in "virtio-rng"
  MAINTAINERS: Fix F: in "vhost-user-stubs"
  MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"
  MAINTAINERS: Fix F: typo in "pcf8574"
  MAINTAINERS: Drop stale F: from "Block I/O path"
  MAINTAINERS: Fix F: typo in "Dump"
  MAINTAINERS: Drop stale F: from "Human Monitor (HMP)"
  MAINTAINERS: Fix F: in "QDev"
  MAINTAINERS: Fix F: in "QMP"
  MAINTAINERS: Fix F: typo in "I3C"
  MAINTAINERS: Drop stale F: from "EDK2 Firmware"
  MAINTAINERS: Drop stale F: from "TCI TCG target"
  MAINTAINERS: Drop stale F: from "Linux io_uring"
  MAINTAINERS: Fix F: in "VFIO-USER"
  MAINTAINERS: Fix F: in "Build and test automation"
  MAINTAINERS: Drop stale F: from "Sphinx documentation configuration
    ..."
  MAINTAINERS: Fix F: in "Rust build system integration"

 MAINTAINERS | 73 ++++++++++++++++++-----------------------------------
 1 file changed, 24 insertions(+), 49 deletions(-)

-- 
2.54.0

[PATCH 01/39] MAINTAINERS: Improve another "Overall" section headline

[Markus Armbruster]

Having scripts/get_maintainer.pl report "Overall" like

    $ scripts/get_maintainer.pl -f cpu-target.c
    Richard Henderson <richard.henderson@linaro.org> (maintainer:Overall)
    Paolo Bonzini <pbonzini@redhat.com> (reviewer:Overall)
    "Philippe Mathieu-Daudé" <philmd@linaro.org> (reviewer:Overall)
    qemu-devel@nongnu.org (open list:All patches CC here)

    John Doe <jdoe@example.org> (maintainer:Overall)

is less than useful.  Commit 6347e1f1cc (MAINTAINERS: Improve section
headlines, 2019-06-06) took care of the issue, but then commit
79ac391592 (MAINTAINERS: Add an 'overall' entry for accelerators,
2020-06-18) added another instance.  Take care of that one.

Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 58686731ba..3270d3d648 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -539,7 +539,7 @@ F: tests/functional/x86_64/test_kvm_xen.py
 
 Guest CPU Cores (other accelerators)
 ------------------------------------
-Overall
+Overall CPUs other accelerators
 M: Richard Henderson <richard.henderson@linaro.org>
 R: Paolo Bonzini <pbonzini@redhat.com>
 R: Philippe Mathieu-Daudé <philmd@linaro.org>
-- 
2.54.0

[PATCH 02/39] MAINTAINERS: Delete trailing colons in section headlines

[Markus Armbruster]

These are harmless as far as I can tell, so this is just for
consistency.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3270d3d648..61d758f9e1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2843,7 +2843,7 @@ F: docs/interop/vhost-user-gpu.rst
 F: contrib/vhost-user-gpu
 F: hw/display/vhost-user-*
 
-qemu-vnc:
+qemu-vnc
 M: Marc-André Lureau <marcandre.lureau@redhat.com>
 S: Maintained
 F: tools/qemu-vnc
@@ -4482,7 +4482,7 @@ F: include/hw/remote/iommu.h
 F: tests/functional/multiprocess.py
 F: tests/functional/*/*multiprocess.py
 
-VFIO-USER:
+VFIO-USER
 M: John Levon <john.levon@nutanix.com>
 M: Thanos Makatos <thanos.makatos@nutanix.com>
 M: Cédric Le Goater <clg@redhat.com>
@@ -4494,7 +4494,7 @@ F: include/hw/vfio-user/*
 F: subprojects/libvfio-user
 F: tests/functional/x86_64/test_vfio_user_client.py
 
-EBPF:
+EBPF
 M: Jason Wang <jasowang@redhat.com>
 R: Andrew Melnychenko <andrew@daynix.com>
 R: Yuri Benditovich <yuri.benditovich@daynix.com>
-- 
2.54.0

Re: [PATCH 02/39] MAINTAINERS: Delete trailing colons in section headlines

[Alex Bennée]

Markus Armbruster <armbru@redhat.com> writes:

> These are harmless as far as I can tell, so this is just for
> consistency.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

[PATCH 03/39] MAINTAINERS: Drop stale F: from "Guest CPU cores (TCG)"

[Markus Armbruster]

We neglected to update MAINTAINERS when we merged util/cacheinfo.c
into util/cacheflush.c.  Update it now.

Fixes: 7971375287 (util: Merge cacheflush.c and cacheinfo.c, 2022-06-20)
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 61d758f9e1..af76d9544d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -175,7 +175,6 @@ F: page-vary-system.c
 F: page-vary-common.c
 F: accel/tcg/
 F: accel/stubs/tcg-stub.c
-F: util/cacheinfo.c
 F: util/cacheflush.c
 F: scripts/decodetree.py
 F: docs/devel/decodetree.rst
-- 
2.54.0

[PATCH 04/39] MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"

[Markus Armbruster]

We neglected to update MAINTAINERS when we merged
linux-user/host/riscv32/ and linux-user/host/riscv32/ into
linux-user/host/riscv/.  The files since moved to linux
linux-user/include/host/riscv64/, which is covered by "Linux user".
Good enough; drop the stale lines.  Matches the other targets.

Fixes: ba0e733362 (configure: Merge riscv32 and riscv64 host architectures, 2021-09-17)
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Alistair Francis <alistair.francis@wdc.com>
Cc: Weiwei Li <liwei1518@gmail.com>
Cc: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>
Cc: Liu Zhiwei <zhiwei_liu@linux.alibaba.com>
Cc: Chao Liu <chao.liu.zevorn@gmail.com>
Cc: qemu-riscv@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index af76d9544d..366fc6c257 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -361,8 +361,6 @@ F: hw/riscv/
 F: hw/intc/riscv*
 F: include/hw/char/riscv_htif.h
 F: include/hw/riscv/
-F: linux-user/host/riscv32/
-F: linux-user/host/riscv64/
 F: common-user/host/riscv*
 F: tests/functional/riscv32
 F: tests/functional/riscv64
-- 
2.54.0

Re: [PATCH 04/39] MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"

[Chao Liu]

On Thu, May 21, 2026 at 10:04:36AM +0800, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we merged
> linux-user/host/riscv32/ and linux-user/host/riscv32/ into
> linux-user/host/riscv/.  The files since moved to linux
> linux-user/include/host/riscv64/, which is covered by "Linux user".
> Good enough; drop the stale lines.  Matches the other targets.
> 
> Fixes: ba0e733362 (configure: Merge riscv32 and riscv64 host architectures, 2021-09-17)
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Alistair Francis <alistair.francis@wdc.com>
> Cc: Weiwei Li <liwei1518@gmail.com>
> Cc: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>
> Cc: Liu Zhiwei <zhiwei_liu@linux.alibaba.com>
> Cc: Chao Liu <chao.liu.zevorn@gmail.com>
> Cc: qemu-riscv@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Chao Liu <chao.liu.zevorn@gmail.com>

Thaks,
Chao
> ---
>  MAINTAINERS | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index af76d9544d..366fc6c257 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -361,8 +361,6 @@ F: hw/riscv/
>  F: hw/intc/riscv*
>  F: include/hw/char/riscv_htif.h
>  F: include/hw/riscv/
> -F: linux-user/host/riscv32/
> -F: linux-user/host/riscv64/
>  F: common-user/host/riscv*
>  F: tests/functional/riscv32
>  F: tests/functional/riscv64
> -- 
> 2.54.0
> 

Re: [PATCH 04/39] MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"

[Alistair Francis]

On Thu, 2026-05-21 at 10:04 +0200, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we merged
> linux-user/host/riscv32/ and linux-user/host/riscv32/ into
> linux-user/host/riscv/.  The files since moved to linux
> linux-user/include/host/riscv64/, which is covered by "Linux user".
> Good enough; drop the stale lines.  Matches the other targets.
> 
> Fixes: ba0e733362 (configure: Merge riscv32 and riscv64 host
> architectures, 2021-09-17)
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Alistair Francis <alistair.francis@wdc.com>
> Cc: Weiwei Li <liwei1518@gmail.com>
> Cc: Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>
> Cc: Liu Zhiwei <zhiwei_liu@linux.alibaba.com>
> Cc: Chao Liu <chao.liu.zevorn@gmail.com>
> Cc: qemu-riscv@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  MAINTAINERS | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index af76d9544d..366fc6c257 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -361,8 +361,6 @@ F: hw/riscv/
>  F: hw/intc/riscv*
>  F: include/hw/char/riscv_htif.h
>  F: include/hw/riscv/
> -F: linux-user/host/riscv32/
> -F: linux-user/host/riscv64/
>  F: common-user/host/riscv*
>  F: tests/functional/riscv32
>  F: tests/functional/riscv64

[PATCH 05/39] MAINTAINERS: Drop stale F: in "SPARC TCG CPUs"

[Markus Armbruster]

We neglected to update MAINTAINERS when we dropped tests/tcg/sparc64/.
Update it now.

Fixes: e9206163d9 (tests/tcg: Remove run-test-mmap-*, 2024-01-02)
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 366fc6c257..d52aada408 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -423,7 +423,6 @@ F: hw/sparc64/
 F: include/hw/sparc/sparc64.h
 F: disas/sparc.c
 F: tests/functional/sparc*/meson.build
-F: tests/tcg/sparc64/
 
 X86 TCG CPUs
 M: Paolo Bonzini <pbonzini@redhat.com>
-- 
2.54.0

[PATCH 06/39] MAINTAINERS: Drop stale F: from "Overall KVM CPUs"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved the only file out of
include/hw/kvm/.  Its new location is covered by "X86 TCG CPUs".  Drop
the stale line.

Fixes: a09ef8ff0a (hw/i386: Rename 'hw/kvm/clock.h' -> 'hw/i386/kvm/clock.h', 2023-06-20)
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d52aada408..d0d89915d0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -471,7 +471,6 @@ S: Supported
 F: */*/kvm*
 F: accel/kvm/
 F: accel/stubs/kvm-stub.c
-F: include/hw/kvm/
 F: include/system/kvm*.h
 F: scripts/kvm/kvm_flightrecorder
 
-- 
2.54.0

[PATCH 07/39] MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted makefiles.  Update
it now.

Fixes: 1a82878a08 (meson: accel, 2019-08-18)
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d0d89915d0..9478a95194 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -547,8 +547,6 @@ F: include/system/cpus.h
 F: include/accel/accel-*.h
 F: accel/accel-*.?
 F: accel/dummy-cpus.?
-F: accel/Makefile.objs
-F: accel/stubs/Makefile.objs
 F: cpu-common.c
 F: cpu-target.c
 F: qapi/accelerator.json
-- 
2.54.0

[PATCH 08/39] MAINTAINERS: Drop stale F: from "virtio"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted makefiles.  Update
it now.

Fixes: be786d2f4a (meson: convert hw/virtio, 2019-08-15)
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9478a95194..caa849b98d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2427,7 +2427,6 @@ virtio
 M: Michael S. Tsirkin <mst@redhat.com>
 S: Supported
 F: hw/*/virtio*
-F: hw/virtio/Makefile.objs
 F: hw/virtio/trace-events
 F: qapi/virtio.json
 F: net/vhost-user.c
-- 
2.54.0

[PATCH 09/39] MAINTAINERS: Fix F: in "Apple Silicon HVF CPUs"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted
target/arm/hvf-stub.c.  Update it now.

Fixes: 293984563e (hw/arm, accel/hvf, whpx: unify get_physical_address_range between WHPX and HVF, 2026-02-10)
Cc: Alexander Graf <agraf@csgraf.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index caa849b98d..65a1dc99b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -556,7 +556,6 @@ Apple Silicon HVF CPUs
 M: Alexander Graf <agraf@csgraf.de>
 S: Maintained
 F: target/arm/hvf/
-F: target/arm/hvf-stub.c
 
 X86 HVF CPUs
 M: Roman Bolshakov <rbolshakov@ddn.com>
-- 
2.54.0

[PATCH 10/39] MAINTAINERS: Drop bad F: in "X86 Xen CPUs"

[Markus Armbruster]

include/hw/block/dataplane/xen* does not exist.
hw/block/dataplane/xen* does, and is covered.  Drop the bad line.

Fixes: fcab2b464e (xen: add header and build dataplane/xen-block.c, 2019-01-08)
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Anthony PERARD <anthony@xenproject.org>
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 65a1dc99b2..44e5f096a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -640,7 +640,6 @@ F: hw/xen/
 F: hw/xenpv/
 F: hw/i386/xen/
 F: hw/pci-host/xen_igd_pt.c
-F: include/hw/block/dataplane/xen*
 F: include/hw/xen/
 F: include/system/xen.h
 F: include/system/xen-mapcache.h
-- 
2.54.0

Re: [PATCH 10/39] MAINTAINERS: Drop bad F: in "X86 Xen CPUs"

[Anthony PERARD]

On Thu, May 21, 2026 at 10:04:42AM +0200, Markus Armbruster wrote:
> include/hw/block/dataplane/xen* does not exist.
> hw/block/dataplane/xen* does, and is covered.  Drop the bad line.
> 
> Fixes: fcab2b464e (xen: add header and build dataplane/xen-block.c, 2019-01-08)
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: Anthony PERARD <anthony@xenproject.org>
> Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> Cc: xen-devel@lists.xenproject.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Anthony PERARD <anthony@xenproject.org>

Thanks,

-- 
Anthony PERARD

[PATCH 11/39] MAINTAINERS: Fix F: in "WebAssembly"

[Markus Armbruster]

We neglected to update MAINTAINERS when we renamed
emsdk-wasm-cross.docker to emsdk-wasm64-cross.docker.  Update it now.

Fixes: 792d94406a (tests/docker: rename wasm cross container, 2026-01-28)
Cc: Kohei Tokunaga <ktokunaga.mail@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 44e5f096a1..a4680516f6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -709,7 +709,7 @@ F: include/system/os-wasm.h
 F: os-wasm.c
 F: util/coroutine-wasm.c
 F: configs/meson/emscripten.txt
-F: tests/docker/dockerfiles/emsdk-wasm-cross.docker
+F: tests/docker/dockerfiles/emsdk-wasm64-cross.docker
 
 Alpha Machines
 --------------
-- 
2.54.0

Re: [PATCH 11/39] MAINTAINERS: Fix F: in "WebAssembly"

[Kohei Tokunaga]

[-- Attachment #1: Type: text/plain, Size: 864 bytes --]

Hi Markus,

Thank you for fixing it.

> We neglected to update MAINTAINERS when we renamed
> emsdk-wasm-cross.docker to emsdk-wasm64-cross.docker.  Update it now.
>
> Fixes: 792d94406a (tests/docker: rename wasm cross container, 2026-01-28)
> Cc: Kohei Tokunaga <ktokunaga.mail@gmail.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 44e5f096a1..a4680516f6 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -709,7 +709,7 @@ F: include/system/os-wasm.h
>  F: os-wasm.c
>  F: util/coroutine-wasm.c
>  F: configs/meson/emscripten.txt
> -F: tests/docker/dockerfiles/emsdk-wasm-cross.docker
> +F: tests/docker/dockerfiles/emsdk-wasm64-cross.docker

Reviewed-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>

Regards,
Kohei Tokunaga

[-- Attachment #2: Type: text/html, Size: 1216 bytes --]

[PATCH 12/39] MAINTAINERS: Fix F: in "Allwinner-a10"

[Markus Armbruster]

We neglected to update MAINTAINERS when we renamed axp209.c to
axp22x.c.  Update it now.

Fixes: a954543092 (hw/misc: Rename axp209 to axp22x and add support AXP221 PMU, 2023-06-06)
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Strahinja Jankovic <strahinja.p.jankovic@gmail.com>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index a4680516f6..839e5036f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -733,7 +733,7 @@ F: hw/ide/ahci-allwinner.c
 F: include/hw/*/allwinner*
 F: hw/arm/cubieboard.c
 F: docs/system/arm/cubieboard.rst
-F: hw/misc/axp209.c
+F: hw/misc/axp2xx.c
 F: tests/functional/arm/test_cubieboard.py
 
 Allwinner-h3
-- 
2.54.0

[PATCH 13/39] MAINTAINERS: Fix F: in "Raspberry Pi"

[Markus Armbruster]

Cover hw/arm/raspi4b.c.  Drop hw/arm/raspi_platform.h, it's in
include/hw/arm/, and covered there.

Fixes: 95a5db3ae5 (MAINTAINERS: Add entries for missing ARM boards, 2018-11-19)
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 839e5036f9..a346728415 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1015,8 +1015,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
 R: Philippe Mathieu-Daudé <philmd@linaro.org>
 L: qemu-arm@nongnu.org
 S: Odd Fixes
-F: hw/arm/raspi.c
-F: hw/arm/raspi_platform.h
+F: hw/arm/raspi*.c
 F: hw/*/bcm283*
 F: include/hw/arm/rasp*
 F: include/hw/*/bcm283*
-- 
2.54.0

Re: [PATCH 13/39] MAINTAINERS: Fix F: in "Raspberry Pi"

[Philippe Mathieu-Daudé]

On 21/5/26 10:04, Markus Armbruster wrote:
> Cover hw/arm/raspi4b.c.  Drop hw/arm/raspi_platform.h, it's in
> include/hw/arm/, and covered there.
> 
> Fixes: 95a5db3ae5 (MAINTAINERS: Add entries for missing ARM boards, 2018-11-19)
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
> Cc: qemu-arm@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 14/39] MAINTAINERS: Drop bad F: from "Xilinx Zynq"

[Markus Armbruster]

hw/misc/zynq_slcr.c never existed.

Fixes: 246f530cdb (adc: Move the zynq-xadc file to the adc directories, 2021-05-18)
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Alistair Francis <alistair@alistair23.me>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index a346728415..976bb65778 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1145,7 +1145,6 @@ F: hw/*/xilinx_*
 F: hw/*/cadence_*
 F: hw/misc/zynq_slcr.c
 F: hw/adc/zynq-xadc.c
-F: include/hw/misc/zynq_slcr.h
 F: include/hw/adc/zynq-xadc.h
 X: hw/ssi/xilinx_*
 F: docs/system/arm/xlnx-zynq.rst
-- 
2.54.0

[PATCH 15/39] MAINTAINERS: Drop stale F: from "New World (mac99)"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted
hw/pci-bridge/dec.[hc].  Update it now.

Fixes: b1fbf24259 (remove DEC 21154 PCI bridge, 2022-11-29)
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 976bb65778..d1cefd2cbb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1568,7 +1568,6 @@ S: Odd Fixes
 F: docs/system/ppc/powermac.rst
 F: hw/ppc/mac_newworld.c
 F: hw/pci-host/uninorth.c
-F: hw/pci-bridge/dec.[hc]
 F: hw/misc/macio/
 F: hw/misc/mos6522*.c
 F: hw/nvram/mac_nvram.c
-- 
2.54.0

[PATCH 16/39] MAINTAINERS: Drop stale F: from "sPAPR (pseries)"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted
include/hw/ppc/pef.h.  Update it now.

Fixes: 00a238b1a8 (ppc/pef: switch to use confidential_guest_kvm_init/reset(), 2024-02-29)
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d1cefd2cbb..87450a84de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1634,7 +1634,6 @@ F: hw/*/xics*
 F: include/hw/*/xics*
 F: include/hw/ppc/fdt.h
 F: hw/ppc/fdt.c
-F: include/hw/ppc/pef.h
 F: hw/ppc/pef.c
 F: pc-bios/slof.bin
 F: docs/system/ppc/pseries.rst
-- 
2.54.0

Re: [PATCH 16/39] MAINTAINERS: Drop stale F: from "sPAPR (pseries)"

[Harsh Prateek Bora]

On 21/05/26 1:34 pm, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we deleted
> include/hw/ppc/pef.h.  Update it now.
> 
> Fixes: 00a238b1a8 (ppc/pef: switch to use confidential_guest_kvm_init/reset(), 2024-02-29)
> Cc: Nicholas Piggin <npiggin@gmail.com>
> Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Cc: qemu-ppc@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d1cefd2cbb..87450a84de 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1634,7 +1634,6 @@ F: hw/*/xics*
>   F: include/hw/*/xics*
>   F: include/hw/ppc/fdt.h
>   F: hw/ppc/fdt.c
> -F: include/hw/ppc/pef.h

Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>

>   F: hw/ppc/pef.c
>   F: pc-bios/slof.bin
>   F: docs/system/ppc/pseries.rst

Re: [PATCH 16/39] MAINTAINERS: Drop stale F: from "sPAPR (pseries)"

[Amit Machhiwal]

On 2026/05/21 10:04 AM, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we deleted
> include/hw/ppc/pef.h.  Update it now.
> 
> Fixes: 00a238b1a8 (ppc/pef: switch to use confidential_guest_kvm_init/reset(), 2024-02-29)
> Cc: Nicholas Piggin <npiggin@gmail.com>
> Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Cc: qemu-ppc@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d1cefd2cbb..87450a84de 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1634,7 +1634,6 @@ F: hw/*/xics*
>  F: include/hw/*/xics*
>  F: include/hw/ppc/fdt.h
>  F: hw/ppc/fdt.c
> -F: include/hw/ppc/pef.h

Confirmed that include/hw/ppc/pef.h was removed in commit 00a238b1a845
("ppc/pef: switch to use confidential_guest_kvm_init/reset()"). The
file is no longer in the tree, making this MAINTAINERS entry stale.

Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>

Thanks,
Amit

>  F: hw/ppc/pef.c
>  F: pc-bios/slof.bin
>  F: docs/system/ppc/pseries.rst
> -- 
> 2.54.0
> 
> 

[PATCH 17/39] MAINTAINERS: Fix F: typo in "sam460ex"

[Markus Armbruster]

Fixes: 2a62bbf4ed (hw/ppc/sam460ex: Update u-boot-sam460ex, 2025-10-28)
Cc: BALATON Zoltan <balaton@eik.bme.hu>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 87450a84de..00a24612b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1693,7 +1693,7 @@ F: hw/display/sm501*
 F: hw/ide/sii3112.c
 F: hw/rtc/m41t80.c
 F: pc-bios/dtb/canyonlands.dt[sb]
-F: pc-bios/u-boot-sam460ex.bin
+F: pc-bios/u-boot-sam460.bin
 F: roms/u-boot-sam460ex
 F: docs/system/ppc/amigang.rst
 F: tests/functional/ppc/test_sam460ex.py
-- 
2.54.0

[PATCH 18/39] MAINTAINERS: Fix F: in "SiFive Machines"

[Markus Armbruster]

The MAINTAINERS update for moving tests into target-specific folders
missed one file.  Correct that.

Fixes: e1a8572a8d (tests/functional: Move riscv32/riscv64 tests into target-specific folders, 2025-08-19)
Cc: Alistair Francis <Alistair.Francis@wdc.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: qemu-riscv@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 00a24612b7..6268ee1d73 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1773,7 +1773,7 @@ S: Supported
 F: docs/system/riscv/sifive_u.rst
 F: hw/*/*sifive*.c
 F: include/hw/*/*sifive*.h
-F: tests/functional/test_riscv64_sifive_u.py
+F: tests/functional/riscv64/test_sifive_u.py
 
 AMD Microblaze-V Generic Board
 M: Sai Pavan Boddu <sai.pavan.boddu@amd.com>
-- 
2.54.0

Re: [PATCH 18/39] MAINTAINERS: Fix F: in "SiFive Machines"

[Alistair Francis]

On Thu, 2026-05-21 at 10:04 +0200, Markus Armbruster wrote:
> The MAINTAINERS update for moving tests into target-specific folders
> missed one file.  Correct that.
> 
> Fixes: e1a8572a8d (tests/functional: Move riscv32/riscv64 tests into
> target-specific folders, 2025-08-19)
> Cc: Alistair Francis <Alistair.Francis@wdc.com>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: qemu-riscv@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 00a24612b7..6268ee1d73 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1773,7 +1773,7 @@ S: Supported
>  F: docs/system/riscv/sifive_u.rst
>  F: hw/*/*sifive*.c
>  F: include/hw/*/*sifive*.h
> -F: tests/functional/test_riscv64_sifive_u.py
> +F: tests/functional/riscv64/test_sifive_u.py
>  
>  AMD Microblaze-V Generic Board
>  M: Sai Pavan Boddu <sai.pavan.boddu@amd.com>

[PATCH 19/39] MAINTAINERS: Fix F: typo in "ACPI/HEST/GHES/ARM processor CPER"

[Markus Armbruster]

Fixes: ddd8f3baa2 (qapi/acpi-hest: add an interface to do generic CPER error injection, 2025-09-23)
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: linux-edac@vger.kernel.org
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 6268ee1d73..38064971fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2237,7 +2237,7 @@ ACPI/HEST/GHES/ARM processor CPER
 M: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 L: linux-edac@vger.kernel.org
 S: Maintained
-F: hw/arm/ghes_cper.c
+F: hw/acpi/ghes_cper.c
 F: hw/acpi/ghes_cper_stub.c
 F: qapi/acpi-hest.json
 F: scripts/ghes_inject.py
-- 
2.54.0

[PATCH 20/39] MAINTAINERS: Fix F: in "SSI"

[Markus Armbruster]

We neglected to update MAINTAINERS when we renamed
tests/qtest/m25p80-test.c to tests/qtest/aspeed_smc-test.c.  Update it now.

Fixes: 5fde7f10c0 (tests/qtest: Rename m25p80 test in aspeed_smc test, 2021-05-01)
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 38064971fe..b7b0cee96c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2299,7 +2299,7 @@ F: hw/ssi/*
 F: hw/block/m25p80*
 F: include/hw/ssi/ssi.h
 X: hw/ssi/xilinx_*
-F: tests/qtest/m25p80-test.c
+F: tests/qtest/aspeed_smc-test.c
 
 Xilinx SPI
 M: Alistair Francis <alistair@alistair23.me>
-- 
2.54.0

[PATCH 21/39] MAINTAINERS: Fix F: in "vhost"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved files from rename
from docs/system/devices/ to docs/system/devices/virtio/.  Update it now.

Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b7b0cee96c..c19d59050d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2401,7 +2401,7 @@ R: Stefano Garzarella <sgarzare@redhat.com>
 S: Supported
 F: hw/*/*vhost*
 F: docs/interop/vhost-user*
-F: docs/system/devices/vhost-user*
+F: docs/system/devices/virtio/vhost-user*
 F: contrib/vhost-user-*/
 F: backends/*vhost*
 F: include/system/vhost-user-backend.h
-- 
2.54.0

[PATCH 22/39] MAINTAINERS: Fix F: in "virtio-input"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved
docs/system/devices/vhost-user-input.rst to
docs/system/devices/virtio/.  We later folded it into
docs/system/devices/virtio/vhost-user-contrib.rst, so cover that
instead.

Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index c19d59050d..d58459d7f0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2491,7 +2491,7 @@ L: virtio-fs@lists.linux.dev
 virtio-input
 M: Gerd Hoffmann <kraxel@redhat.com>
 S: Odd Fixes
-F: docs/system/devices/vhost-user-input.rst
+F: docs/system/devices/virtio/vhost-user-contrib.rst
 F: hw/input/virtio-input*.c
 F: hw/virtio/vhost-user-input.c
 F: include/hw/virtio/virtio-input.h
-- 
2.54.0

[PATCH 23/39] MAINTAINERS: Fix bad / stale F: in "virtio-rng"

[Markus Armbruster]

tools/vhost-user-rng/* never existed.  Drop the bad line.

We neglected to update MAINTAINERS when we moved
docs/system/devices/vhost-user-rng.rst to docs/system/devices/virtio/.
We later deleted the file.  Drop the stale line.

Fixes: e3e01466bf (MAINTAINERS: Add maintainer for vhost-user RNG implementation, 2021-06-14)
Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Amit Shah <amit@kernel.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d58459d7f0..8fff1649ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2541,11 +2541,9 @@ F: hw/virtio/vhost-user-device*
 vhost-user-rng
 M: Mathieu Poirier <mathieu.poirier@linaro.org>
 S: Supported
-F: docs/system/devices/vhost-user-rng.rst
 F: hw/virtio/vhost-user-rng.c
 F: hw/virtio/vhost-user-rng-pci.c
 F: include/hw/virtio/vhost-user-rng.h
-F: tools/vhost-user-rng/*
 
 vhost-user-gpio
 M: Alex Bennée <alex.bennee@linaro.org>
-- 
2.54.0

Re: [PATCH 23/39] MAINTAINERS: Fix bad / stale F: in "virtio-rng"

[Laurent Vivier]

Hi,

it seems to be "vhost-user-rng" rather than "virtio-rng"

Thanks,
Laurent

On 5/21/26 10:04, Markus Armbruster wrote:
> tools/vhost-user-rng/* never existed.  Drop the bad line.
> 
> We neglected to update MAINTAINERS when we moved
> docs/system/devices/vhost-user-rng.rst to docs/system/devices/virtio/.
> We later deleted the file.  Drop the stale line.
> 
> Fixes: e3e01466bf (MAINTAINERS: Add maintainer for vhost-user RNG implementation, 2021-06-14)
> Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
> Cc: Laurent Vivier <lvivier@redhat.com>
> Cc: Amit Shah <amit@kernel.org>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d58459d7f0..8fff1649ab 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2541,11 +2541,9 @@ F: hw/virtio/vhost-user-device*
>   vhost-user-rng
>   M: Mathieu Poirier <mathieu.poirier@linaro.org>
>   S: Supported
> -F: docs/system/devices/vhost-user-rng.rst
>   F: hw/virtio/vhost-user-rng.c
>   F: hw/virtio/vhost-user-rng-pci.c
>   F: include/hw/virtio/vhost-user-rng.h
> -F: tools/vhost-user-rng/*
>   
>   vhost-user-gpio
>   M: Alex Bennée <alex.bennee@linaro.org>

Re: [PATCH 23/39] MAINTAINERS: Fix bad / stale F: in "virtio-rng"

[Markus Armbruster]

Laurent Vivier <lvivier@redhat.com> writes:

> Hi,
>
> it seems to be "vhost-user-rng" rather than "virtio-rng"

Yes, my bad.  Thanks!

[PATCH 24/39] MAINTAINERS: Fix F: in "vhost-user-stubs"

[Markus Armbruster]

We neglected to update MAINTAINERS when we renamed
hw/virtio/vhost-user-device-pci.c and hw/virtio/vhost-user-device.c to
hw/virtio/vhost-user-test-device-pci.c and
hw/virtio/vhost-user-test-device.c.  Update it now.

Fixes: 722e9022a0 (hw/virtio: rename vhost-user-device and make user creatable, 2025-09-01)
Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8fff1649ab..03817a0ebe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2536,7 +2536,7 @@ vhost-user-stubs
 M: Alex Bennée <alex.bennee@linaro.org>
 S: Maintained
 F: hw/virtio/vhost-user-base.c
-F: hw/virtio/vhost-user-device*
+F: hw/virtio/vhost-user-test-device*
 
 vhost-user-rng
 M: Mathieu Poirier <mathieu.poirier@linaro.org>
-- 
2.54.0

[PATCH 25/39] MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved
docs/system/devices/virtio-snd.rst and
docs/system/devices/virtio-gpu.rst to docs/system/devices/virtio/.
Update it now.

Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Cc: Alex Bennée <alex.bennee@linaro.org>
Cc: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 03817a0ebe..c864fb971d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2613,7 +2613,7 @@ S: Supported
 F: hw/audio/virtio-snd.c
 F: hw/audio/virtio-snd-pci.c
 F: include/hw/audio/virtio-snd.h
-F: docs/system/devices/virtio-snd.rst
+F: docs/system/devices/virtio/virtio-snd.rst
 
 nvme
 M: Keith Busch <kbusch@kernel.org>
@@ -2802,7 +2802,7 @@ S: Odd Fixes
 F: hw/display/virtio-gpu*
 F: hw/display/virtio-vga.*
 F: include/hw/virtio/virtio-gpu.h
-F: docs/system/devices/virtio-gpu.rst
+F: docs/system/devices/virtio/virtio-gpu.rst
 F: tests/functional/aarch64/test_virt_gpu.py
 F: tests/functional/x86_64/test_virtio_gpu.py
 
-- 
2.54.0

Re: [PATCH 25/39] MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"

[Manos Pitsidianakis]

On Thu, May 21, 2026 at 11:05 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> We neglected to update MAINTAINERS when we moved
> docs/system/devices/virtio-snd.rst and
> docs/system/devices/virtio-gpu.rst to docs/system/devices/virtio/.
> Update it now.
>
> Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

Thanks,

>  MAINTAINERS | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 03817a0ebe..c864fb971d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2613,7 +2613,7 @@ S: Supported
>  F: hw/audio/virtio-snd.c
>  F: hw/audio/virtio-snd-pci.c
>  F: include/hw/audio/virtio-snd.h
> -F: docs/system/devices/virtio-snd.rst
> +F: docs/system/devices/virtio/virtio-snd.rst
>
>  nvme
>  M: Keith Busch <kbusch@kernel.org>
> @@ -2802,7 +2802,7 @@ S: Odd Fixes
>  F: hw/display/virtio-gpu*
>  F: hw/display/virtio-vga.*
>  F: include/hw/virtio/virtio-gpu.h
> -F: docs/system/devices/virtio-gpu.rst
> +F: docs/system/devices/virtio/virtio-gpu.rst
>  F: tests/functional/aarch64/test_virt_gpu.py
>  F: tests/functional/x86_64/test_virtio_gpu.py
>
> --
> 2.54.0
>

Re: [PATCH 25/39] MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"

[Alex Bennée]

Markus Armbruster <armbru@redhat.com> writes:

> We neglected to update MAINTAINERS when we moved
> docs/system/devices/virtio-snd.rst and
> docs/system/devices/virtio-gpu.rst to docs/system/devices/virtio/.
> Update it now.
>
> Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 25/39] MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"

[Akihiko Odaki]

On 2026/05/21 17:04, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we moved
> docs/system/devices/virtio-snd.rst and
> docs/system/devices/virtio-gpu.rst to docs/system/devices/virtio/.
> Update it now.
> 
> Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>

Regards,
Akihiko Odaki

Re: [PATCH 25/39] MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"

[Dmitry Osipenko]

On 5/21/26 11:04, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we moved
> docs/system/devices/virtio-snd.rst and
> docs/system/devices/virtio-gpu.rst to docs/system/devices/virtio/.
> Update it now.
> 
> Fixes: 487ce6ce99 (docs/system: split VirtIO devices from the rest, 2025-10-16)
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 03817a0ebe..c864fb971d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2613,7 +2613,7 @@ S: Supported
>  F: hw/audio/virtio-snd.c
>  F: hw/audio/virtio-snd-pci.c
>  F: include/hw/audio/virtio-snd.h
> -F: docs/system/devices/virtio-snd.rst
> +F: docs/system/devices/virtio/virtio-snd.rst
>  
>  nvme
>  M: Keith Busch <kbusch@kernel.org>
> @@ -2802,7 +2802,7 @@ S: Odd Fixes
>  F: hw/display/virtio-gpu*
>  F: hw/display/virtio-vga.*
>  F: include/hw/virtio/virtio-gpu.h
> -F: docs/system/devices/virtio-gpu.rst
> +F: docs/system/devices/virtio/virtio-gpu.rst
>  F: tests/functional/aarch64/test_virt_gpu.py
>  F: tests/functional/x86_64/test_virtio_gpu.py
>  

Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>

-- 
Best regards,
Dmitry

[PATCH 26/39] MAINTAINERS: Fix F: typo in "pcf8574"

[Markus Armbruster]

Fixes: 4cbb1513a2 (hw/gpio: introduce pcf8574 driver, 2024-03-11)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index c864fb971d..4ef1bd2835 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2717,7 +2717,7 @@ F: include/hw/i2c/i2c_mux_pca954x.h
 pcf8574
 S: Orphan
 F: hw/gpio/pcf8574.c
-F: include/gpio/pcf8574.h
+F: include/hw/gpio/pcf8574.h
 
 Generic Loader
 M: Alistair Francis <alistair@alistair23.me>
-- 
2.54.0

Re: [PATCH 26/39] MAINTAINERS: Fix F: typo in "pcf8574"

[Philippe Mathieu-Daudé]

On 21/5/26 10:04, Markus Armbruster wrote:
> Fixes: 4cbb1513a2 (hw/gpio: introduce pcf8574 driver, 2024-03-11)
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Oops.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 27/39] MAINTAINERS: Drop stale F: from "Block I/O path"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted
tests/unit/test-fdmon-epoll.c.  Update it now.

Fixes: 60f782b6b7 (aio: remove aio_disable_external() API, 2023-05-16)
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fam Zheng <fam@euphon.net>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4ef1bd2835..8859406c9f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3141,7 +3141,6 @@ F: include/qemu/aio.h
 F: include/qemu/aio-wait.h
 F: include/qemu/defer-call.h
 F: scripts/qemugdb/aio.py
-F: tests/unit/test-fdmon-epoll.c
 T: git https://github.com/stefanha/qemu.git block
 
 Block SCSI subsystem
-- 
2.54.0

Re: [PATCH 27/39] MAINTAINERS: Drop stale F: from "Block I/O path"

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

On Thu, May 21, 2026 at 10:04:59AM +0200, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we deleted
> tests/unit/test-fdmon-epoll.c.  Update it now.
> 
> Fixes: 60f782b6b7 (aio: remove aio_disable_external() API, 2023-05-16)
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Fam Zheng <fam@euphon.net>
> Cc: qemu-block@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH 28/39] MAINTAINERS: Fix F: typo in "Dump"

[Markus Armbruster]

Fixes: 6d3da32c8b (MAINTAINERS: Add Windows dump to section "Dump", 2019-06-19)
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Ani Sinha <anisinha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8859406c9f..95dbd663d4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3267,7 +3267,7 @@ R: Ani Sinha <anisinha@redhat.com>
 F: dump/
 F: hw/misc/vmcoreinfo.c
 F: include/hw/misc/vmcoreinfo.h
-F: include/qemu/win_dump_defs
+F: include/qemu/win_dump_defs.h
 F: include/system/dump-arch.h
 F: include/system/dump.h
 F: qapi/dump.json
-- 
2.54.0

Re: [PATCH 28/39] MAINTAINERS: Fix F: typo in "Dump"

[Philippe Mathieu-Daudé]

On 21/5/26 10:05, Markus Armbruster wrote:
> Fixes: 6d3da32c8b (MAINTAINERS: Add Windows dump to section "Dump", 2019-06-19)
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Ani Sinha <anisinha@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 29/39] MAINTAINERS: Drop stale F: from "Human Monitor (HMP)"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved hmp.h to
include/monitor/.  Commit 17dc3ae3e1 (monitor: Extract completion
declarations to 'monitor/hmp-completion.h', 2026-03-20) added the
missing entry without deleting the stale one.  Do that now.

Fixes: 275307aaab (hmp: Move hmp.h to include/monitor/, 2019-06-19)
Cc: Dr. David Alan Gilbert <dave@treblig.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 95dbd663d4..abffa4730e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3418,7 +3418,6 @@ S: Maintained
 F: monitor/monitor-internal.h
 F: monitor/monitor.c
 F: monitor/hmp*
-F: hmp.h
 F: hmp-commands*.hx
 F: include/monitor/hmp.h
 F: include/monitor/hmp-completion.h
-- 
2.54.0

Re: [PATCH 29/39] MAINTAINERS: Drop stale F: from "Human Monitor (HMP)"

[Dr. David Alan Gilbert]

* Markus Armbruster (armbru@redhat.com) wrote:
> We neglected to update MAINTAINERS when we moved hmp.h to
> include/monitor/.  Commit 17dc3ae3e1 (monitor: Extract completion
> declarations to 'monitor/hmp-completion.h', 2026-03-20) added the
> missing entry without deleting the stale one.  Do that now.
> 
> Fixes: 275307aaab (hmp: Move hmp.h to include/monitor/, 2019-06-19)
> Cc: Dr. David Alan Gilbert <dave@treblig.org>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>

> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 95dbd663d4..abffa4730e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3418,7 +3418,6 @@ S: Maintained
>  F: monitor/monitor-internal.h
>  F: monitor/monitor.c
>  F: monitor/hmp*
> -F: hmp.h
>  F: hmp-commands*.hx
>  F: include/monitor/hmp.h
>  F: include/monitor/hmp-completion.h
> -- 
> 2.54.0
> 
-- 
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/

[PATCH 30/39] MAINTAINERS: Fix F: in "QDev"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved qdev headers from
include/hw/ to include/hw/core/.  Update it now.

Fixes: 3775d19906 (include: move hw/qdev-clock.h to hw/core/, 2025-11-27)
Fixes: d1000ecae2 (include: move hw/qdev-core.h to hw/core/, rename, 2025-11-27)
Fixes: f7889f86bd (include: move hw/qdev-dma.h to hw/core/, 2025-11-27)
Fixes: 78d45220b4 (include: move hw/qdev-properties.h to hw/core/, 2025-11-27)
Fixes: e1e9a72500 (include: move hw/qdev-properties-system.h to hw/core/, 2025-11-27)
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index abffa4730e..9ad37f5133 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3575,7 +3575,7 @@ F: docs/qdev-device-use.txt
 F: hw/core/qdev*
 F: hw/core/bus.c
 F: hw/core/sysbus.c
-F: include/hw/qdev*
+F: include/hw/core/qdev*
 F: include/monitor/qdev.h
 F: qapi/qdev.json
 F: system/qdev-monitor.c
-- 
2.54.0

Re: [PATCH 30/39] MAINTAINERS: Fix F: in "QDev"

[Philippe Mathieu-Daudé]

On 21/5/26 10:05, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we moved qdev headers from
> include/hw/ to include/hw/core/.  Update it now.
> 
> Fixes: 3775d19906 (include: move hw/qdev-clock.h to hw/core/, 2025-11-27)
> Fixes: d1000ecae2 (include: move hw/qdev-core.h to hw/core/, rename, 2025-11-27)
> Fixes: f7889f86bd (include: move hw/qdev-dma.h to hw/core/, 2025-11-27)
> Fixes: 78d45220b4 (include: move hw/qdev-properties.h to hw/core/, 2025-11-27)
> Fixes: e1e9a72500 (include: move hw/qdev-properties-system.h to hw/core/, 2025-11-27)
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 31/39] MAINTAINERS: Fix F: in "QMP"

[Markus Armbruster]

We neglected to update MAINTAINERS when we renamed
docs/devel/writing-monitor-commands.rst, and when we renamed
monitor/misc.c.  The latter file no longer exists, so simply drop the
line.  Update the other one.

Fixes: 0e33e3d2c4 (docs/devel: rename file for writing monitor commands, 2021-09-09)
Fixes: 864a3fa439 (monitor: Rename misc.c to hmp-target.c, 2023-01-24)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9ad37f5133..b1b298fb0e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3591,12 +3591,11 @@ M: Markus Armbruster <armbru@redhat.com>
 S: Supported
 F: monitor/monitor-internal.h
 F: monitor/qmp*
-F: monitor/misc.c
 F: monitor/monitor.c
 F: qapi/control.json
 F: qapi/error.json
 F: qapi/introspect.json
-F: docs/devel/*qmp-*
+F: docs/devel/writing-monitor-commands.rst
 F: docs/interop/*qmp-*
 F: scripts/qmp/
 F: tests/qtest/qmp-test.c
-- 
2.54.0

[PATCH 32/39] MAINTAINERS: Fix F: typo in "I3C"

[Markus Armbruster]

Fixes: 5f682daa65 (MAINTAINERS: Add I3C maintainers and reviewer, 2026-02-25)
Cc: Joe Komlodi <komlodi@google.com>
Cc: Cédric Le Goater <clg@kaod.org>
Cc: Jamin Lin <jamin_lin@aspeedtech.com>
Cc: Nabih Estefan <nabihestefan@google.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b1b298fb0e..7899b91620 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3965,7 +3965,7 @@ M: Jamin Lin <jamin_lin@aspeedtech.com>
 R: Nabih Estefan <nabihestefan@google.com>
 S: Maintained
 F: hw/i3c/*.c
-F: hw/i3c/.h
+F: hw/i3c/*.h
 F: hw/i3c/Kconfig
 F: hw/i3c/meson.build
 F: hw/i3c/trace-events
-- 
2.54.0

RE: [PATCH 32/39] MAINTAINERS: Fix F: typo in "I3C"

[Jamin Lin]

Hi Markus,

> Subject: [PATCH 32/39] MAINTAINERS: Fix F: typo in "I3C"
> 
> Fixes: 5f682daa65 (MAINTAINERS: Add I3C maintainers and reviewer,
> 2026-02-25)
> Cc: Joe Komlodi <komlodi@google.com>
> Cc: Cédric Le Goater <clg@kaod.org>
> Cc: Jamin Lin <jamin_lin@aspeedtech.com>
> Cc: Nabih Estefan <nabihestefan@google.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b1b298fb0e..7899b91620 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3965,7 +3965,7 @@ M: Jamin Lin <jamin_lin@aspeedtech.com>
>  R: Nabih Estefan <nabihestefan@google.com>
>  S: Maintained
>  F: hw/i3c/*.c
> -F: hw/i3c/.h
> +F: hw/i3c/*.h
>  F: hw/i3c/Kconfig
>  F: hw/i3c/meson.build
>  F: hw/i3c/trace-events
> --
> 2.54.0

Reviewed-by: Jamin Lin <jamin_lin@aspeedtech.com>

Thanks,
Jamin

Re: [PATCH 32/39] MAINTAINERS: Fix F: typo in "I3C"

[Cédric Le Goater]

On 5/21/26 10:05, Markus Armbruster wrote:
> Fixes: 5f682daa65 (MAINTAINERS: Add I3C maintainers and reviewer, 2026-02-25)
> Cc: Joe Komlodi <komlodi@google.com>
> Cc: Cédric Le Goater <clg@kaod.org>
> Cc: Jamin Lin <jamin_lin@aspeedtech.com>
> Cc: Nabih Estefan <nabihestefan@google.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b1b298fb0e..7899b91620 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3965,7 +3965,7 @@ M: Jamin Lin <jamin_lin@aspeedtech.com>
>   R: Nabih Estefan <nabihestefan@google.com>
>   S: Maintained
>   F: hw/i3c/*.c
> -F: hw/i3c/.h
> +F: hw/i3c/*.h
>   F: hw/i3c/Kconfig
>   F: hw/i3c/meson.build
>   F: hw/i3c/trace-events

oops. Sorry.


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.

[PATCH 33/39] MAINTAINERS: Drop stale F: from "EDK2 Firmware"

[Markus Armbruster]

We neglected to update MAINTAINERS when we dropped roms/Makefile.edk2.
Update it now.

Fixes: 22e11539e1 (edk2: replace build scripts, 2023-03-09)
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7899b91620..7862e2df0b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4007,7 +4007,6 @@ S: Supported
 F: hw/i386/*ovmf*
 F: pc-bios/descriptors/??-edk2-*.json
 F: pc-bios/edk2-*
-F: roms/Makefile.edk2
 F: roms/edk2
 F: roms/edk2-*
 F: tests/data/uefi-boot-images/
-- 
2.54.0

[PATCH 34/39] MAINTAINERS: Drop stale F: from "TCI TCG target"

[Markus Armbruster]

We neglected to update MAINTAINERS when we dropped disas/tci.c.
Update it now.

Fixes: 59964b4f98 (tcg/tci: Implement the disassembler properly, 2021-01-30)
Cc: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7862e2df0b..d3b79e3eeb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4177,7 +4177,6 @@ M: Stefan Weil <sw@weilnetz.de>
 S: Maintained
 F: tcg/tci/
 F: tcg/tci.c
-F: disas/tci.c
 
 Block drivers
 -------------
-- 
2.54.0

Re: [PATCH 34/39] MAINTAINERS: Drop stale F: from "TCI TCG target"

[Stefan Weil via qemu development]

Am 21.05.26 um 10:05 schrieb Markus Armbruster:

> We neglected to update MAINTAINERS when we dropped disas/tci.c.
> Update it now.
>
> Fixes: 59964b4f98 (tcg/tci: Implement the disassembler properly, 2021-01-30)
> Cc: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7862e2df0b..d3b79e3eeb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4177,7 +4177,6 @@ M: Stefan Weil <sw@weilnetz.de>
>   S: Maintained
>   F: tcg/tci/
>   F: tcg/tci.c
> -F: disas/tci.c
>   
>   Block drivers
>   -------------


Thanks!

Reviewed-by: Stefan Weil <sw@weilnetz.de>

[PATCH 35/39] MAINTAINERS: Drop stale F: from "Linux io_uring"

[Markus Armbruster]

We neglected to update MAINTAINERS when we dropped stubs/io_uring.c.
Update it now.

Fixes: 047dabef97 (block/io_uring: use aio_add_sqe(), 2025-11-03)
Cc: Julia Suvorova <jusual@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Stefano Garzarella <sgarzare@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index d3b79e3eeb..7a1b1317cf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4350,7 +4350,6 @@ R: Stefano Garzarella <sgarzare@redhat.com>
 L: qemu-block@nongnu.org
 S: Maintained
 F: block/io_uring.c
-F: stubs/io_uring.c
 
 qcow2
 M: Kevin Wolf <kwolf@redhat.com>
-- 
2.54.0

Re: [PATCH 35/39] MAINTAINERS: Drop stale F: from "Linux io_uring"

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

On Thu, May 21, 2026 at 10:05:07AM +0200, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we dropped stubs/io_uring.c.
> Update it now.
> 
> Fixes: 047dabef97 (block/io_uring: use aio_add_sqe(), 2025-11-03)
> Cc: Julia Suvorova <jusual@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Stefano Garzarella <sgarzare@redhat.com>
> Cc: qemu-block@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PATCH 36/39] MAINTAINERS: Fix F: in "VFIO-USER"

[Markus Armbruster]

The commit adding the section added two bad F: lines:
include/hw/vfio-user/ never existed, and subprojects/libvfio-user had
long been replaced by subprojects/libvfio.wrap.  Drop the former, and
correct the latter.

Fixes: 9fca2b7d70 (vfio-user: add vfio-user class and container, 2025-06-25)
Cc: John Levon <john.levon@nutanix.com>
Cc: Thanos Makatos <thanos.makatos@nutanix.com>
Cc: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7a1b1317cf..ca86e1410b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4468,8 +4468,7 @@ S: Supported
 F: docs/interop/vfio-user.rst
 F: docs/system/devices/vfio-user.rst
 F: hw/vfio-user/*
-F: include/hw/vfio-user/*
-F: subprojects/libvfio-user
+F: subprojects/libvfio-user.wrap
 F: tests/functional/x86_64/test_vfio_user_client.py
 
 EBPF
-- 
2.54.0

Re: [PATCH 36/39] MAINTAINERS: Fix F: in "VFIO-USER"

[Cédric Le Goater]

On 5/21/26 10:05, Markus Armbruster wrote:
> The commit adding the section added two bad F: lines:
> include/hw/vfio-user/ never existed, and subprojects/libvfio-user had
> long been replaced by subprojects/libvfio.wrap.  Drop the former, and
> correct the latter.
> 
> Fixes: 9fca2b7d70 (vfio-user: add vfio-user class and container, 2025-06-25)
> Cc: John Levon <john.levon@nutanix.com>
> Cc: Thanos Makatos <thanos.makatos@nutanix.com>
> Cc: Cédric Le Goater <clg@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7a1b1317cf..ca86e1410b 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4468,8 +4468,7 @@ S: Supported
>   F: docs/interop/vfio-user.rst
>   F: docs/system/devices/vfio-user.rst
>   F: hw/vfio-user/*
> -F: include/hw/vfio-user/*
> -F: subprojects/libvfio-user
> +F: subprojects/libvfio-user.wrap
>   F: tests/functional/x86_64/test_vfio_user_client.py
>   
>   EBPF


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.

Re: [PATCH 36/39] MAINTAINERS: Fix F: in "VFIO-USER"

[John Levon]

On Thu, May 21, 2026 at 10:05:08AM +0200, Markus Armbruster wrote:

> The commit adding the section added two bad F: lines:
> include/hw/vfio-user/ never existed, and subprojects/libvfio-user had
> long been replaced by subprojects/libvfio.wrap.  Drop the former, and
> correct the latter.
> 
> Fixes: 9fca2b7d70 (vfio-user: add vfio-user class and container, 2025-06-25)
> Cc: John Levon <john.levon@nutanix.com>
> Cc: Thanos Makatos <thanos.makatos@nutanix.com>
> Cc: Cédric Le Goater <clg@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7a1b1317cf..ca86e1410b 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4468,8 +4468,7 @@ S: Supported
>  F: docs/interop/vfio-user.rst
>  F: docs/system/devices/vfio-user.rst
>  F: hw/vfio-user/*
> -F: include/hw/vfio-user/*
> -F: subprojects/libvfio-user
> +F: subprojects/libvfio-user.wrap
>  F: tests/functional/x86_64/test_vfio_user_client.py
>  
>  EBPF

Reviewed-by: John Levon <john.levon@nutanix.com>

[PATCH 37/39] MAINTAINERS: Fix F: in "Build and test automation"

[Markus Armbruster]

We neglected to update MAINTAINERS when we split of the testing docs.
Commit 97b091c88f (MAINTAINERS: Update the paths to the testing
documentation files, 2025-06-10) updated it belatedly, but missed one
line.  Correct that now.

Fixes: ff41da5030 (docs/devel: Split testing docs from the build docs and move to separate folder, 2024-08-30)
Cc: Alex Bennée <alex.bennee@linaro.org>
Cc: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index ca86e1410b..e13939589a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4491,7 +4491,7 @@ F: .github/workflows/lockdown.yml
 F: .gitlab-ci.yml
 F: .gitlab-ci.d/
 F: .travis.yml
-F: docs/devel/ci*
+F: docs/devel/testing/ci*
 F: scripts/ci/
 F: tests/docker/
 F: tests/vm/
-- 
2.54.0

Re: [PATCH 37/39] MAINTAINERS: Fix F: in "Build and test automation"

[Pierrick Bouvier]

On 5/21/2026 1:05 AM, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we split of the testing docs.
> Commit 97b091c88f (MAINTAINERS: Update the paths to the testing
> documentation files, 2025-06-10) updated it belatedly, but missed one
> line.  Correct that now.
> 
> Fixes: ff41da5030 (docs/devel: Split testing docs from the build docs and move to separate folder, 2024-08-30)
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Cc: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

[PATCH 38/39] MAINTAINERS: Drop stale F: from "Sphinx documentation configuration ..."

[Markus Armbruster]

We neglected to update MAINTAINERS when we fused the conf.py into one,
and when we deleted the kernel-doc script.  Update it now.

Fixes: b93f4fbdc4 (docs: Build and install all the docs in a single manual, 2021-01-15)
Fixes: 619d5f0211 (scripts/kernel-doc: Delete the old Perl kernel-doc script, 2025-08-14)
Cc: John Snow <jsnow@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index e13939589a..b7fe4fa58a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4614,13 +4614,11 @@ M: Peter Maydell <peter.maydell@linaro.org>
 M: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 S: Maintained
 F: docs/conf.py
-F: docs/*/conf.py
 F: docs/requirements.txt
 F: docs/sphinx/
 F: docs/_templates/
 F: docs/devel/docs.rst
 F: docs/devel/qapi-domain.rst
-F: scripts/kernel-doc
 F: scripts/lib/kdoc/
 
 Rust build system integration
-- 
2.54.0

[PATCH 39/39] MAINTAINERS: Fix F: in "Rust build system integration"

[Markus Armbruster]

We neglected to update MAINTAINERS when we moved rust/wrapper.h, and
again when we split it up.  Update it now.

Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Cc: qemu-rust@nongnu.org
Fixes: 1ae4ca0463 (rust: move rust.bindgen to qemu-api crate, 2025-06-13)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b7fe4fa58a..37bc1bab06 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4629,7 +4629,7 @@ F: scripts/rust/
 F: rust/.gitignore
 F: rust/Kconfig
 F: rust/meson.build
-F: rust/wrapper.h
+F: rust/bindings/*/wrapper.h
 
 Miscellaneous
 -------------
-- 
2.54.0

Re: [PATCH 39/39] MAINTAINERS: Fix F: in "Rust build system integration"

[Manos Pitsidianakis]

On Thu, May 21, 2026 at 11:05 AM Markus Armbruster <armbru@redhat.com> wrote:
>
> We neglected to update MAINTAINERS when we moved rust/wrapper.h, and
> again when we split it up.  Update it now.
>
> Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
> Cc: qemu-rust@nongnu.org
> Fixes: 1ae4ca0463 (rust: move rust.bindgen to qemu-api crate, 2025-06-13)
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

Thanks,

>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b7fe4fa58a..37bc1bab06 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4629,7 +4629,7 @@ F: scripts/rust/
>  F: rust/.gitignore
>  F: rust/Kconfig
>  F: rust/meson.build
> -F: rust/wrapper.h
> +F: rust/bindings/*/wrapper.h
>
>  Miscellaneous
>  -------------
> --
> 2.54.0
>

Re: [PATCH 00/39] MAINTAINERS: Fix F: lines

[Pierrick Bouvier]

[-- Attachment #1: Type: text/plain, Size: 5527 bytes --]

Hi Markus,

On 5/21/2026 1:04 AM, Markus Armbruster wrote:
> Quite a few F: lines don't match any files.  The quick & dirty check
> 
>     $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null
> 
> finds about fifty.
> 
> Philippe Mathieu-Daudé recently posted a few fixes:
> 
>   MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>   MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
>   MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
>   MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
>   MAINTAINERS: Cover python.docker with Python library section
>   MAINTAINERS: Fix s390x storage key/attribute device paths
>   MAINTAINERS: Fix tcg/s390x/ path
>   MAINTAINERS: Correct scripts/coverity-model.c path
>   MAINTAINERS: Fix hexagon-linux-user.mak path
> 
> These are in
> 
>    Subject: [PATCH 0/7] docker: Remove LegacyKeyValueFormat warnings
>    Date: Mon, 18 May 2026 12:22:15 +0200
>    Message-ID: <20260518102222.80735-1-philmd@linaro.org>
> 
>    Subject: [PATCH v2 0/4] buildsys: Stop checking for ESA/390 host
>    Date: Tue, 19 May 2026 19:12:36 +0200
>    Message-ID: <20260519171240.97420-1-philmd@linaro.org>
> 
> 
>    Subject: [PATCH] MAINTAINERS: Correct scripts/coverity-model.c path
>    Date: Tue, 19 May 2026 19:19:26 +0200
>    Message-ID: <20260519171926.98099-1-philmd@linaro.org>
> 
>    Subject: [PATCH] MAINTAINERS: Fix hexagon-linux-user.mak path
>    Date: Wed, 20 May 2026 14:39:47 +0200
>    Message-ID: <20260520123947.12711-1-philmd@linaro.org>
> 
> This series takes care of the remainder, except for one discussed
> below.  It applies cleanly with and without Philippe's patches.
> 
> The exception is the last line in
> 
>     Python scripts
>     M: John Snow <jsnow@redhat.com>
>     M: Cleber Rosa <crosa@redhat.com>
>     S: Odd Fixes
>     F: scripts/*.py
>     F: tests/*.py
> 
> Both F: are actually wrong here: they match only in the scripts/ and
> tests/ not further down.  Left for another day.
> 
> Markus Armbruster (39):
>   MAINTAINERS: Improve another "Overall" section headline
>   MAINTAINERS: Delete trailing colons in section headlines
>   MAINTAINERS: Drop stale F: from "Guest CPU cores (TCG)"
>   MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"
>   MAINTAINERS: Drop stale F: in "SPARC TCG CPUs"
>   MAINTAINERS: Drop stale F: from "Overall KVM CPUs"
>   MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"
>   MAINTAINERS: Drop stale F: from "virtio"
>   MAINTAINERS: Fix F: in "Apple Silicon HVF CPUs"
>   MAINTAINERS: Drop bad F: in "X86 Xen CPUs"
>   MAINTAINERS: Fix F: in "WebAssembly"
>   MAINTAINERS: Fix F: in "Allwinner-a10"
>   MAINTAINERS: Fix F: in "Raspberry Pi"
>   MAINTAINERS: Drop bad F: from "Xilinx Zynq"
>   MAINTAINERS: Drop stale F: from "New World (mac99)"
>   MAINTAINERS: Drop stale F: from "sPAPR (pseries)"
>   MAINTAINERS: Fix F: typo in "sam460ex"
>   MAINTAINERS: Fix F: in "SiFive Machines"
>   MAINTAINERS: Fix F: typo in "ACPI/HEST/GHES/ARM processor CPER"
>   MAINTAINERS: Fix F: in "SSI"
>   MAINTAINERS: Fix F: in "vhost"
>   MAINTAINERS: Fix F: in "virtio-input"
>   MAINTAINERS: Fix bad / stale F: in "virtio-rng"
>   MAINTAINERS: Fix F: in "vhost-user-stubs"
>   MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"
>   MAINTAINERS: Fix F: typo in "pcf8574"
>   MAINTAINERS: Drop stale F: from "Block I/O path"
>   MAINTAINERS: Fix F: typo in "Dump"
>   MAINTAINERS: Drop stale F: from "Human Monitor (HMP)"
>   MAINTAINERS: Fix F: in "QDev"
>   MAINTAINERS: Fix F: in "QMP"
>   MAINTAINERS: Fix F: typo in "I3C"
>   MAINTAINERS: Drop stale F: from "EDK2 Firmware"
>   MAINTAINERS: Drop stale F: from "TCI TCG target"
>   MAINTAINERS: Drop stale F: from "Linux io_uring"
>   MAINTAINERS: Fix F: in "VFIO-USER"
>   MAINTAINERS: Fix F: in "Build and test automation"
>   MAINTAINERS: Drop stale F: from "Sphinx documentation configuration
>     ..."
>   MAINTAINERS: Fix F: in "Rust build system integration"
> 
>  MAINTAINERS | 73 ++++++++++++++++++-----------------------------------
>  1 file changed, 24 insertions(+), 49 deletions(-)
> 

thanks for posting this.

In addition, see the patch attached to this email.
It integrates checking this directly at configure time, so we never run
into any missing entry again in the future.

I share this here not for a review, but simply to avoid a duplicated
effort, and make sure people know it will be sent after this series.

I don't believe in adding this in checkpatch, because it's not enforced
systematically unfortunately. Breaking the meson configuration is a good
way to make sure it's enforced by design.

With your series applied, the left entries are:
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +258:
configs/targets/hexagon-linux-user/default.mak
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +259:
docker/dockerfiles/debian-hexagon-cross.docker
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2956:
hw/s390x/storage-keys.h
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2965:
hw/s390x/storage-attributes.h
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3241:
scripts/coverity-model.c
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3468:
tests/*.py
No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +4149:
tcg/s390/

Once your current series is pulled, I'll fix the remaining and send the
attached patch. Or feel free to do it directly if you like the idea :)

Regards,
Pierrick

[-- Attachment #2: 0001-meson.build-check-MAINTAINERS-file-is-consistent-wit.patch --]
[-- Type: text/plain, Size: 3293 bytes --]

From 6c9b49ac7ec06c0159d2b4ba9c9d1081e02ef765 Mon Sep 17 00:00:00 2001
From: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date: Fri, 22 May 2026 12:23:17 -0700
Subject: [PATCH] meson.build: check MAINTAINERS file is consistent with source
 tree

We add a new script: scripts/check-maintainers-file.py, that will run at
configuration time (and not at build time), to not hurt build time.
This script runs in 0.2s on my dev VM, which has an old cpu.

We can expect things to be mostly in sync since adding or removing a
source or test file will trigger a configure step.
For the rest, like docs, tcg tests, or remaining files, GitLab CI will
build things from scratch and always run the configure step.

With this, it should be impossible by design to have an upstream
MAINTAINERS file with non existing file entries.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
---
 meson.build                       |  5 +++
 scripts/check-maintainers-file.py | 53 +++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100755 scripts/check-maintainers-file.py

diff --git a/meson.build b/meson.build
index eeb096c1487..ddfb0b90ca6 100644
--- a/meson.build
+++ b/meson.build
@@ -18,6 +18,11 @@ add_test_setup('thorough',
 
 meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
 
+# check our MAINTAINERS file is consistent
+check_maintainers = find_program('scripts/check-maintainers-file.py')
+maintainers_file = files('MAINTAINERS')
+run_command([check_maintainers, maintainers_file], check: true, console: true)
+
 ####################
 # Global variables #
 ####################
diff --git a/scripts/check-maintainers-file.py b/scripts/check-maintainers-file.py
new file mode 100755
index 00000000000..b001816a401
--- /dev/null
+++ b/scripts/check-maintainers-file.py
@@ -0,0 +1,53 @@
+#! /usr/bin/env python3
+
+# Check incorrect file entries in MAINTAINERS
+#
+# Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import argparse
+import glob
+import sys
+
+
+def check_one_entry(line) -> bool:
+    return True
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Check MAINTAINERS file")
+    parser.add_argument("maintainers", help="Path to MAINTAINERS file")
+    args = parser.parse_args()
+
+    found_file_entry = False
+    found_incorrect_entries = False
+    line_counter = 0
+
+    with open(args.maintainers) as file:
+        for entry in file:
+            line_counter += 1
+
+            if not entry.startswith("F:"):
+                continue
+            entry = entry[2:].strip()
+            found_file_entry = True
+
+            file_exists = len(glob.glob(entry, recursive=True)) > 0
+            if file_exists:
+                continue
+
+            found_incorrect_entries = True
+            print(
+                f"No matching files for {args.maintainers} +{line_counter}: {entry}",
+                file=sys.stderr,
+            )
+
+    if not found_file_entry:
+        raise Exception("no file entry found - is MAINTAINERS path correct?")
+    if found_incorrect_entries:
+        raise Exception(f"incorrect entries found in {args.maintainers}")
+
+
+if __name__ == "__main__":
+    main()
-- 
2.43.0

Re: [PATCH 00/39] MAINTAINERS: Fix F: lines

[Markus Armbruster]

Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:

> Hi Markus,
>
> On 5/21/2026 1:04 AM, Markus Armbruster wrote:
>> Quite a few F: lines don't match any files.  The quick & dirty check
>> 
>>     $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null
>> 
>> finds about fifty.
>> 
>> Philippe Mathieu-Daudé recently posted a few fixes:
>> 
>>   MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>>   MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
>>   MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
>>   MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
>>   MAINTAINERS: Cover python.docker with Python library section
>>   MAINTAINERS: Fix s390x storage key/attribute device paths
>>   MAINTAINERS: Fix tcg/s390x/ path
>>   MAINTAINERS: Correct scripts/coverity-model.c path
>>   MAINTAINERS: Fix hexagon-linux-user.mak path
>> 
>> These are in
>> 
>>    Subject: [PATCH 0/7] docker: Remove LegacyKeyValueFormat warnings
>>    Date: Mon, 18 May 2026 12:22:15 +0200
>>    Message-ID: <20260518102222.80735-1-philmd@linaro.org>
>> 
>>    Subject: [PATCH v2 0/4] buildsys: Stop checking for ESA/390 host
>>    Date: Tue, 19 May 2026 19:12:36 +0200
>>    Message-ID: <20260519171240.97420-1-philmd@linaro.org>
>> 
>> 
>>    Subject: [PATCH] MAINTAINERS: Correct scripts/coverity-model.c path
>>    Date: Tue, 19 May 2026 19:19:26 +0200
>>    Message-ID: <20260519171926.98099-1-philmd@linaro.org>
>> 
>>    Subject: [PATCH] MAINTAINERS: Fix hexagon-linux-user.mak path
>>    Date: Wed, 20 May 2026 14:39:47 +0200
>>    Message-ID: <20260520123947.12711-1-philmd@linaro.org>
>> 
>> This series takes care of the remainder, except for one discussed
>> below.  It applies cleanly with and without Philippe's patches.
>> 
>> The exception is the last line in
>> 
>>     Python scripts
>>     M: John Snow <jsnow@redhat.com>
>>     M: Cleber Rosa <crosa@redhat.com>
>>     S: Odd Fixes
>>     F: scripts/*.py
>>     F: tests/*.py
>> 
>> Both F: are actually wrong here: they match only in the scripts/ and
>> tests/ not further down.  Left for another day.
>> 
>> Markus Armbruster (39):
>>   MAINTAINERS: Improve another "Overall" section headline
>>   MAINTAINERS: Delete trailing colons in section headlines
>>   MAINTAINERS: Drop stale F: from "Guest CPU cores (TCG)"
>>   MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"
>>   MAINTAINERS: Drop stale F: in "SPARC TCG CPUs"
>>   MAINTAINERS: Drop stale F: from "Overall KVM CPUs"
>>   MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"
>>   MAINTAINERS: Drop stale F: from "virtio"
>>   MAINTAINERS: Fix F: in "Apple Silicon HVF CPUs"
>>   MAINTAINERS: Drop bad F: in "X86 Xen CPUs"
>>   MAINTAINERS: Fix F: in "WebAssembly"
>>   MAINTAINERS: Fix F: in "Allwinner-a10"
>>   MAINTAINERS: Fix F: in "Raspberry Pi"
>>   MAINTAINERS: Drop bad F: from "Xilinx Zynq"
>>   MAINTAINERS: Drop stale F: from "New World (mac99)"
>>   MAINTAINERS: Drop stale F: from "sPAPR (pseries)"
>>   MAINTAINERS: Fix F: typo in "sam460ex"
>>   MAINTAINERS: Fix F: in "SiFive Machines"
>>   MAINTAINERS: Fix F: typo in "ACPI/HEST/GHES/ARM processor CPER"
>>   MAINTAINERS: Fix F: in "SSI"
>>   MAINTAINERS: Fix F: in "vhost"
>>   MAINTAINERS: Fix F: in "virtio-input"
>>   MAINTAINERS: Fix bad / stale F: in "virtio-rng"
>>   MAINTAINERS: Fix F: in "vhost-user-stubs"
>>   MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"
>>   MAINTAINERS: Fix F: typo in "pcf8574"
>>   MAINTAINERS: Drop stale F: from "Block I/O path"
>>   MAINTAINERS: Fix F: typo in "Dump"
>>   MAINTAINERS: Drop stale F: from "Human Monitor (HMP)"
>>   MAINTAINERS: Fix F: in "QDev"
>>   MAINTAINERS: Fix F: in "QMP"
>>   MAINTAINERS: Fix F: typo in "I3C"
>>   MAINTAINERS: Drop stale F: from "EDK2 Firmware"
>>   MAINTAINERS: Drop stale F: from "TCI TCG target"
>>   MAINTAINERS: Drop stale F: from "Linux io_uring"
>>   MAINTAINERS: Fix F: in "VFIO-USER"
>>   MAINTAINERS: Fix F: in "Build and test automation"
>>   MAINTAINERS: Drop stale F: from "Sphinx documentation configuration
>>     ..."
>>   MAINTAINERS: Fix F: in "Rust build system integration"
>> 
>>  MAINTAINERS | 73 ++++++++++++++++++-----------------------------------
>>  1 file changed, 24 insertions(+), 49 deletions(-)
>> 
>
> thanks for posting this.
>
> In addition, see the patch attached to this email.
> It integrates checking this directly at configure time, so we never run
> into any missing entry again in the future.
>
> I share this here not for a review, but simply to avoid a duplicated
> effort, and make sure people know it will be sent after this series.
>
> I don't believe in adding this in checkpatch, because it's not enforced
> systematically unfortunately. Breaking the meson configuration is a good
> way to make sure it's enforced by design.

No objection.

> With your series applied, the left entries are:

Most of these are fixed in Philippe's patches mentioned above.

> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +258:
> configs/targets/hexagon-linux-user/default.mak

MAINTAINERS: Fix hexagon-linux-user.mak path

> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +259:
> docker/dockerfiles/debian-hexagon-cross.docker

MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path

> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2956:
> hw/s390x/storage-keys.h
> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2965:
> hw/s390x/storage-attributes.h

MAINTAINERS: Fix s390x storage key/attribute device paths

> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3241:
> scripts/coverity-model.c

MAINTAINERS: Correct scripts/coverity-model.c path

> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3468:
> tests/*.py

This is the exception I mentioned above.

The intent is to match *.py below tests/.  It actually matches only in
tests/, not in its subdirectories.

Here's a dumb fix:

    F: tests/*.py
    F: tests/*/*.py
    F: tests/*/*/*.py
    F: tests/*/*/*/*.py

for however many levels we have.  Same for the scripts/ line next to it.
Blech.

The smart fix might be to port N: from the kernel.

	N: Files and directories *Regex* patterns.
	   N:	[^a-z]tegra	all files whose path contains tegra
	                        (not including files like integrator)
	   One pattern per line.  Multiple N: lines acceptable.
	   scripts/get_maintainer.pl has different behavior for files that
	   match F: pattern and matches of N: patterns.  By default,
	   get_maintainer will not look at git log history when an F: pattern
	   match occurs.  When an N: match occurs, git log history is used
	   to also notify the people that have git commit signatures.

But I wonder: is this section useful at all?

> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +4149:
> tcg/s390/

MAINTAINERS: Fix tcg/s390x/ path

> Once your current series is pulled, I'll fix the remaining and send the
> attached patch. Or feel free to do it directly if you like the idea :)
>
> Regards,
> Pierrick

Two remarks inline.

> From 6c9b49ac7ec06c0159d2b4ba9c9d1081e02ef765 Mon Sep 17 00:00:00 2001
> From: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> Date: Fri, 22 May 2026 12:23:17 -0700
> Subject: [PATCH] meson.build: check MAINTAINERS file is consistent with source
>  tree
>
> We add a new script: scripts/check-maintainers-file.py, that will run at
> configuration time (and not at build time), to not hurt build time.
> This script runs in 0.2s on my dev VM, which has an old cpu.
>
> We can expect things to be mostly in sync since adding or removing a
> source or test file will trigger a configure step.
> For the rest, like docs, tcg tests, or remaining files, GitLab CI will
> build things from scratch and always run the configure step.
>
> With this, it should be impossible by design to have an upstream
> MAINTAINERS file with non existing file entries.
>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> ---
>  meson.build                       |  5 +++
>  scripts/check-maintainers-file.py | 53 +++++++++++++++++++++++++++++++
>  2 files changed, 58 insertions(+)
>  create mode 100755 scripts/check-maintainers-file.py
>
> diff --git a/meson.build b/meson.build
> index eeb096c1487..ddfb0b90ca6 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -18,6 +18,11 @@ add_test_setup('thorough',
>  
>  meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
>  
> +# check our MAINTAINERS file is consistent
> +check_maintainers = find_program('scripts/check-maintainers-file.py')
> +maintainers_file = files('MAINTAINERS')
> +run_command([check_maintainers, maintainers_file], check: true, console: true)

My version of meson (1.8.5) chokes on console: true.  According to
https://mesonbuild.com/Reference-manual_functions_run_command.html#run_command_console
it's new in 1.11.0.

I tested with it deleted.

> +
>  ####################
>  # Global variables #
>  ####################
> diff --git a/scripts/check-maintainers-file.py b/scripts/check-maintainers-file.py
> new file mode 100755
> index 00000000000..b001816a401
> --- /dev/null
> +++ b/scripts/check-maintainers-file.py
> @@ -0,0 +1,53 @@
> +#! /usr/bin/env python3
> +
> +# Check incorrect file entries in MAINTAINERS
> +#
> +# Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +import argparse
> +import glob
> +import sys
> +
> +
> +def check_one_entry(line) -> bool:
> +    return True
> +
> +
> +def main() -> None:
> +    parser = argparse.ArgumentParser(description="Check MAINTAINERS file")
> +    parser.add_argument("maintainers", help="Path to MAINTAINERS file")
> +    args = parser.parse_args()
> +
> +    found_file_entry = False
> +    found_incorrect_entries = False
> +    line_counter = 0
> +
> +    with open(args.maintainers) as file:
> +        for entry in file:
> +            line_counter += 1
> +
> +            if not entry.startswith("F:"):
> +                continue
> +            entry = entry[2:].strip()
> +            found_file_entry = True
> +
> +            file_exists = len(glob.glob(entry, recursive=True)) > 0

I'm afraid this matches files not in git, just like my quick & dirty
one-liner.  Shouldn't we match against contents of HEAD, say output of
"git-ls-tree -r --name-only @"?

> +            if file_exists:
> +                continue
> +
> +            found_incorrect_entries = True
> +            print(
> +                f"No matching files for {args.maintainers} +{line_counter}: {entry}",
> +                file=sys.stderr,
> +            )
> +
> +    if not found_file_entry:
> +        raise Exception("no file entry found - is MAINTAINERS path correct?")
> +    if found_incorrect_entries:
> +        raise Exception(f"incorrect entries found in {args.maintainers}")
> +
> +
> +if __name__ == "__main__":
> +    main()

Re: [PATCH 00/39] MAINTAINERS: Fix F: lines

[Pierrick Bouvier]

On 6/1/2026 3:06 AM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:
> 
>> Hi Markus,
>>
>> On 5/21/2026 1:04 AM, Markus Armbruster wrote:
>>> Quite a few F: lines don't match any files.  The quick & dirty check
>>>
>>>     $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null
>>>
>>> finds about fifty.
>>>
>>> Philippe Mathieu-Daudé recently posted a few fixes:
>>>
>>>   MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>>>   MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
>>>   MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
>>>   MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
>>>   MAINTAINERS: Cover python.docker with Python library section
>>>   MAINTAINERS: Fix s390x storage key/attribute device paths
>>>   MAINTAINERS: Fix tcg/s390x/ path
>>>   MAINTAINERS: Correct scripts/coverity-model.c path
>>>   MAINTAINERS: Fix hexagon-linux-user.mak path
>>>
>>> These are in
>>>
>>>    Subject: [PATCH 0/7] docker: Remove LegacyKeyValueFormat warnings
>>>    Date: Mon, 18 May 2026 12:22:15 +0200
>>>    Message-ID: <20260518102222.80735-1-philmd@linaro.org>
>>>
>>>    Subject: [PATCH v2 0/4] buildsys: Stop checking for ESA/390 host
>>>    Date: Tue, 19 May 2026 19:12:36 +0200
>>>    Message-ID: <20260519171240.97420-1-philmd@linaro.org>
>>>
>>>
>>>    Subject: [PATCH] MAINTAINERS: Correct scripts/coverity-model.c path
>>>    Date: Tue, 19 May 2026 19:19:26 +0200
>>>    Message-ID: <20260519171926.98099-1-philmd@linaro.org>
>>>
>>>    Subject: [PATCH] MAINTAINERS: Fix hexagon-linux-user.mak path
>>>    Date: Wed, 20 May 2026 14:39:47 +0200
>>>    Message-ID: <20260520123947.12711-1-philmd@linaro.org>
>>>
>>> This series takes care of the remainder, except for one discussed
>>> below.  It applies cleanly with and without Philippe's patches.
>>>
>>> The exception is the last line in
>>>
>>>     Python scripts
>>>     M: John Snow <jsnow@redhat.com>
>>>     M: Cleber Rosa <crosa@redhat.com>
>>>     S: Odd Fixes
>>>     F: scripts/*.py
>>>     F: tests/*.py
>>>
>>> Both F: are actually wrong here: they match only in the scripts/ and
>>> tests/ not further down.  Left for another day.
>>>
>>> Markus Armbruster (39):
>>>   MAINTAINERS: Improve another "Overall" section headline
>>>   MAINTAINERS: Delete trailing colons in section headlines
>>>   MAINTAINERS: Drop stale F: from "Guest CPU cores (TCG)"
>>>   MAINTAINERS: Drop stale F: in "RISC-V TCG CPUs"
>>>   MAINTAINERS: Drop stale F: in "SPARC TCG CPUs"
>>>   MAINTAINERS: Drop stale F: from "Overall KVM CPUs"
>>>   MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"
>>>   MAINTAINERS: Drop stale F: from "virtio"
>>>   MAINTAINERS: Fix F: in "Apple Silicon HVF CPUs"
>>>   MAINTAINERS: Drop bad F: in "X86 Xen CPUs"
>>>   MAINTAINERS: Fix F: in "WebAssembly"
>>>   MAINTAINERS: Fix F: in "Allwinner-a10"
>>>   MAINTAINERS: Fix F: in "Raspberry Pi"
>>>   MAINTAINERS: Drop bad F: from "Xilinx Zynq"
>>>   MAINTAINERS: Drop stale F: from "New World (mac99)"
>>>   MAINTAINERS: Drop stale F: from "sPAPR (pseries)"
>>>   MAINTAINERS: Fix F: typo in "sam460ex"
>>>   MAINTAINERS: Fix F: in "SiFive Machines"
>>>   MAINTAINERS: Fix F: typo in "ACPI/HEST/GHES/ARM processor CPER"
>>>   MAINTAINERS: Fix F: in "SSI"
>>>   MAINTAINERS: Fix F: in "vhost"
>>>   MAINTAINERS: Fix F: in "virtio-input"
>>>   MAINTAINERS: Fix bad / stale F: in "virtio-rng"
>>>   MAINTAINERS: Fix F: in "vhost-user-stubs"
>>>   MAINTAINERS: Fix F: in "virtio-snd" and "virtio-gpu"
>>>   MAINTAINERS: Fix F: typo in "pcf8574"
>>>   MAINTAINERS: Drop stale F: from "Block I/O path"
>>>   MAINTAINERS: Fix F: typo in "Dump"
>>>   MAINTAINERS: Drop stale F: from "Human Monitor (HMP)"
>>>   MAINTAINERS: Fix F: in "QDev"
>>>   MAINTAINERS: Fix F: in "QMP"
>>>   MAINTAINERS: Fix F: typo in "I3C"
>>>   MAINTAINERS: Drop stale F: from "EDK2 Firmware"
>>>   MAINTAINERS: Drop stale F: from "TCI TCG target"
>>>   MAINTAINERS: Drop stale F: from "Linux io_uring"
>>>   MAINTAINERS: Fix F: in "VFIO-USER"
>>>   MAINTAINERS: Fix F: in "Build and test automation"
>>>   MAINTAINERS: Drop stale F: from "Sphinx documentation configuration
>>>     ..."
>>>   MAINTAINERS: Fix F: in "Rust build system integration"
>>>
>>>  MAINTAINERS | 73 ++++++++++++++++++-----------------------------------
>>>  1 file changed, 24 insertions(+), 49 deletions(-)
>>>
>>
>> thanks for posting this.
>>
>> In addition, see the patch attached to this email.
>> It integrates checking this directly at configure time, so we never run
>> into any missing entry again in the future.
>>
>> I share this here not for a review, but simply to avoid a duplicated
>> effort, and make sure people know it will be sent after this series.
>>
>> I don't believe in adding this in checkpatch, because it's not enforced
>> systematically unfortunately. Breaking the meson configuration is a good
>> way to make sure it's enforced by design.
> 
> No objection.
> 
>> With your series applied, the left entries are:
> 
> Most of these are fixed in Philippe's patches mentioned above.
>

👍

>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +258:
>> configs/targets/hexagon-linux-user/default.mak
> 
> MAINTAINERS: Fix hexagon-linux-user.mak path
> 
>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +259:
>> docker/dockerfiles/debian-hexagon-cross.docker
> 
> MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
> 
>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2956:
>> hw/s390x/storage-keys.h
>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2965:
>> hw/s390x/storage-attributes.h
> 
> MAINTAINERS: Fix s390x storage key/attribute device paths
> 
>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3241:
>> scripts/coverity-model.c
> 
> MAINTAINERS: Correct scripts/coverity-model.c path
> 
>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3468:
>> tests/*.py
> 
> This is the exception I mentioned above.
> 
> The intent is to match *.py below tests/.  It actually matches only in
> tests/, not in its subdirectories.
> 
> Here's a dumb fix:
> 
>     F: tests/*.py
>     F: tests/*/*.py
>     F: tests/*/*/*.py
>     F: tests/*/*/*/*.py
> 

It's acceptable, and nice because it's not ambiguous.
Also, it shows us the first line is not a correct entry (there is no
tests/*.py).

> for however many levels we have.  Same for the scripts/ line next to it.
> Blech.
> 
> The smart fix might be to port N: from the kernel.
> 
> 	N: Files and directories *Regex* patterns.
> 	   N:	[^a-z]tegra	all files whose path contains tegra
> 	                        (not including files like integrator)
> 	   One pattern per line.  Multiple N: lines acceptable.
> 	   scripts/get_maintainer.pl has different behavior for files that
> 	   match F: pattern and matches of N: patterns.  By default,
> 	   get_maintainer will not look at git log history when an F: pattern
> 	   match occurs.  When an N: match occurs, git log history is used
> 	   to also notify the people that have git commit signatures.
> 
> But I wonder: is this section useful at all?
>

I would prefer to use the manual entries approach above, especially if
there is only folder that is concerned.
When we'll have two different use case, maybe we can consider a more
generic approach.

>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +4149:
>> tcg/s390/
> 
> MAINTAINERS: Fix tcg/s390x/ path
> 
>> Once your current series is pulled, I'll fix the remaining and send the
>> attached patch. Or feel free to do it directly if you like the idea :)
>>
>> Regards,
>> Pierrick
> 
> Two remarks inline.
> 
>> From 6c9b49ac7ec06c0159d2b4ba9c9d1081e02ef765 Mon Sep 17 00:00:00 2001
>> From: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>> Date: Fri, 22 May 2026 12:23:17 -0700
>> Subject: [PATCH] meson.build: check MAINTAINERS file is consistent with source
>>  tree
>>
>> We add a new script: scripts/check-maintainers-file.py, that will run at
>> configuration time (and not at build time), to not hurt build time.
>> This script runs in 0.2s on my dev VM, which has an old cpu.
>>
>> We can expect things to be mostly in sync since adding or removing a
>> source or test file will trigger a configure step.
>> For the rest, like docs, tcg tests, or remaining files, GitLab CI will
>> build things from scratch and always run the configure step.
>>
>> With this, it should be impossible by design to have an upstream
>> MAINTAINERS file with non existing file entries.
>>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>> ---
>>  meson.build                       |  5 +++
>>  scripts/check-maintainers-file.py | 53 +++++++++++++++++++++++++++++++
>>  2 files changed, 58 insertions(+)
>>  create mode 100755 scripts/check-maintainers-file.py
>>
>> diff --git a/meson.build b/meson.build
>> index eeb096c1487..ddfb0b90ca6 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -18,6 +18,11 @@ add_test_setup('thorough',
>>  
>>  meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
>>  
>> +# check our MAINTAINERS file is consistent
>> +check_maintainers = find_program('scripts/check-maintainers-file.py')
>> +maintainers_file = files('MAINTAINERS')
>> +run_command([check_maintainers, maintainers_file], check: true, console: true)
> 
> My version of meson (1.8.5) chokes on console: true.  According to
> https://mesonbuild.com/Reference-manual_functions_run_command.html#run_command_console
> it's new in 1.11.0.
>

Our configure script creates a venv with an updated version of meson,
which is 1.11.1 at the moment.
If you called meson directly (which uses your host meson), it's not how
we're supposed to build QEMU.
How did you try this?

> I tested with it deleted.
> 
>> +
>>  ####################
>>  # Global variables #
>>  ####################
>> diff --git a/scripts/check-maintainers-file.py b/scripts/check-maintainers-file.py
>> new file mode 100755
>> index 00000000000..b001816a401
>> --- /dev/null
>> +++ b/scripts/check-maintainers-file.py
>> @@ -0,0 +1,53 @@
>> +#! /usr/bin/env python3
>> +
>> +# Check incorrect file entries in MAINTAINERS
>> +#
>> +# Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>> +#
>> +# SPDX-License-Identifier: GPL-2.0-or-later
>> +
>> +import argparse
>> +import glob
>> +import sys
>> +
>> +
>> +def check_one_entry(line) -> bool:
>> +    return True
>> +
>> +
>> +def main() -> None:
>> +    parser = argparse.ArgumentParser(description="Check MAINTAINERS file")
>> +    parser.add_argument("maintainers", help="Path to MAINTAINERS file")
>> +    args = parser.parse_args()
>> +
>> +    found_file_entry = False
>> +    found_incorrect_entries = False
>> +    line_counter = 0
>> +
>> +    with open(args.maintainers) as file:
>> +        for entry in file:
>> +            line_counter += 1
>> +
>> +            if not entry.startswith("F:"):
>> +                continue
>> +            entry = entry[2:].strip()
>> +            found_file_entry = True
>> +
>> +            file_exists = len(glob.glob(entry, recursive=True)) > 0
> 
> I'm afraid this matches files not in git, just like my quick & dirty
> one-liner.  Shouldn't we match against contents of HEAD, say output of
> "git-ls-tree -r --name-only @"?
>

I don't think it's needed to restrict to git ls-tree. The only risk is
that people have a local file they forgot (or didn't want) to add in
git. It will be caught by CI that won't have such a file, so we're safe.

What do you think?

>> +            if file_exists:
>> +                continue
>> +
>> +            found_incorrect_entries = True
>> +            print(
>> +                f"No matching files for {args.maintainers} +{line_counter}: {entry}",
>> +                file=sys.stderr,
>> +            )
>> +
>> +    if not found_file_entry:
>> +        raise Exception("no file entry found - is MAINTAINERS path correct?")
>> +    if found_incorrect_entries:
>> +        raise Exception(f"incorrect entries found in {args.maintainers}")
>> +
>> +
>> +if __name__ == "__main__":
>> +    main()
> 

Regards,
Pierrick

Re: [PATCH 00/39] MAINTAINERS: Fix F: lines

[Markus Armbruster]

Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:

> On 6/1/2026 3:06 AM, Markus Armbruster wrote:
>> Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:
>> 
>>> Hi Markus,
>>>
>>> On 5/21/2026 1:04 AM, Markus Armbruster wrote:
>>>> Quite a few F: lines don't match any files.  The quick & dirty check
>>>>
>>>>     $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null
>>>>
>>>> finds about fifty.
>>>>
>>>> Philippe Mathieu-Daudé recently posted a few fixes:
>>>>
>>>>   MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>>>>   MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
>>>>   MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
>>>>   MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
>>>>   MAINTAINERS: Cover python.docker with Python library section
>>>>   MAINTAINERS: Fix s390x storage key/attribute device paths
>>>>   MAINTAINERS: Fix tcg/s390x/ path
>>>>   MAINTAINERS: Correct scripts/coverity-model.c path
>>>>   MAINTAINERS: Fix hexagon-linux-user.mak path

[...]

>>> In addition, see the patch attached to this email.
>>> It integrates checking this directly at configure time, so we never run
>>> into any missing entry again in the future.
>>>
>>> I share this here not for a review, but simply to avoid a duplicated
>>> effort, and make sure people know it will be sent after this series.
>>>
>>> I don't believe in adding this in checkpatch, because it's not enforced
>>> systematically unfortunately. Breaking the meson configuration is a good
>>> way to make sure it's enforced by design.
>> 
>> No objection.
>> 
>>> With your series applied, the left entries are:
>> 
>> Most of these are fixed in Philippe's patches mentioned above.
>>
>
> 👍
>
>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +258:
>>> configs/targets/hexagon-linux-user/default.mak
>> 
>> MAINTAINERS: Fix hexagon-linux-user.mak path
>> 
>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +259:
>>> docker/dockerfiles/debian-hexagon-cross.docker
>> 
>> MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>> 
>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2956:
>>> hw/s390x/storage-keys.h
>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2965:
>>> hw/s390x/storage-attributes.h
>> 
>> MAINTAINERS: Fix s390x storage key/attribute device paths
>> 
>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3241:
>>> scripts/coverity-model.c
>> 
>> MAINTAINERS: Correct scripts/coverity-model.c path
>> 
>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3468:
>>> tests/*.py
>> 
>> This is the exception I mentioned above.
>> 
>> The intent is to match *.py below tests/.  It actually matches only in
>> tests/, not in its subdirectories.
>> 
>> Here's a dumb fix:
>> 
>>     F: tests/*.py
>>     F: tests/*/*.py
>>     F: tests/*/*/*.py
>>     F: tests/*/*/*/*.py
>> 
>
> It's acceptable, and nice because it's not ambiguous.
> Also, it shows us the first line is not a correct entry (there is no
> tests/*.py).

It's also brittle: breaks when we add the first .py at level.

>> for however many levels we have.  Same for the scripts/ line next to it.
>> Blech.
>> 
>> The smart fix might be to port N: from the kernel.
>> 
>> 	N: Files and directories *Regex* patterns.
>> 	   N:	[^a-z]tegra	all files whose path contains tegra
>> 	                        (not including files like integrator)
>> 	   One pattern per line.  Multiple N: lines acceptable.
>> 	   scripts/get_maintainer.pl has different behavior for files that
>> 	   match F: pattern and matches of N: patterns.  By default,
>> 	   get_maintainer will not look at git log history when an F: pattern
>> 	   match occurs.  When an N: match occurs, git log history is used
>> 	   to also notify the people that have git commit signatures.
>> 
>> But I wonder: is this section useful at all?
>
> I would prefer to use the manual entries approach above, especially if
> there is only folder that is concerned.
> When we'll have two different use case, maybe we can consider a more
> generic approach.

I'm aware of just two:

    Python scripts
    M: John Snow <jsnow@redhat.com>
    M: Cleber Rosa <crosa@redhat.com>
    S: Odd Fixes
    F: scripts/*.py
    F: tests/*.py

The section was added almost a decade ago (commit ad904f6689f), and
never worked as intended.  I asked John Snow about deleting it to
unblock your work.  He told me he'd be fine with that.  Could add it
back later fixed.

>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +4149:
>>> tcg/s390/
>> 
>> MAINTAINERS: Fix tcg/s390x/ path
>> 
>>> Once your current series is pulled, I'll fix the remaining and send the
>>> attached patch. Or feel free to do it directly if you like the idea :)
>>>
>>> Regards,
>>> Pierrick
>> 
>> Two remarks inline.
>> 
>>> From 6c9b49ac7ec06c0159d2b4ba9c9d1081e02ef765 Mon Sep 17 00:00:00 2001
>>> From: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>>> Date: Fri, 22 May 2026 12:23:17 -0700
>>> Subject: [PATCH] meson.build: check MAINTAINERS file is consistent with source
>>>  tree
>>>
>>> We add a new script: scripts/check-maintainers-file.py, that will run at
>>> configuration time (and not at build time), to not hurt build time.
>>> This script runs in 0.2s on my dev VM, which has an old cpu.
>>>
>>> We can expect things to be mostly in sync since adding or removing a
>>> source or test file will trigger a configure step.
>>> For the rest, like docs, tcg tests, or remaining files, GitLab CI will
>>> build things from scratch and always run the configure step.
>>>
>>> With this, it should be impossible by design to have an upstream
>>> MAINTAINERS file with non existing file entries.
>>>
>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>>> ---
>>>  meson.build                       |  5 +++
>>>  scripts/check-maintainers-file.py | 53 +++++++++++++++++++++++++++++++
>>>  2 files changed, 58 insertions(+)
>>>  create mode 100755 scripts/check-maintainers-file.py
>>>
>>> diff --git a/meson.build b/meson.build
>>> index eeb096c1487..ddfb0b90ca6 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -18,6 +18,11 @@ add_test_setup('thorough',
>>>  
>>>  meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
>>>  
>>> +# check our MAINTAINERS file is consistent
>>> +check_maintainers = find_program('scripts/check-maintainers-file.py')
>>> +maintainers_file = files('MAINTAINERS')
>>> +run_command([check_maintainers, maintainers_file], check: true, console: true)
>> 
>> My version of meson (1.8.5) chokes on console: true.  According to
>> https://mesonbuild.com/Reference-manual_functions_run_command.html#run_command_console
>> it's new in 1.11.0.
>>
>
> Our configure script creates a venv with an updated version of meson,
> which is 1.11.1 at the moment.
> If you called meson directly (which uses your host meson), it's not how
> we're supposed to build QEMU.
> How did you try this?

I ran make :)

>> I tested with it deleted.
>> 
>>> +
>>>  ####################
>>>  # Global variables #
>>>  ####################
>>> diff --git a/scripts/check-maintainers-file.py b/scripts/check-maintainers-file.py
>>> new file mode 100755
>>> index 00000000000..b001816a401
>>> --- /dev/null
>>> +++ b/scripts/check-maintainers-file.py
>>> @@ -0,0 +1,53 @@
>>> +#! /usr/bin/env python3
>>> +
>>> +# Check incorrect file entries in MAINTAINERS
>>> +#
>>> +# Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>>> +#
>>> +# SPDX-License-Identifier: GPL-2.0-or-later
>>> +
>>> +import argparse
>>> +import glob
>>> +import sys
>>> +
>>> +
>>> +def check_one_entry(line) -> bool:
>>> +    return True
>>> +
>>> +
>>> +def main() -> None:
>>> +    parser = argparse.ArgumentParser(description="Check MAINTAINERS file")
>>> +    parser.add_argument("maintainers", help="Path to MAINTAINERS file")
>>> +    args = parser.parse_args()
>>> +
>>> +    found_file_entry = False
>>> +    found_incorrect_entries = False
>>> +    line_counter = 0
>>> +
>>> +    with open(args.maintainers) as file:
>>> +        for entry in file:
>>> +            line_counter += 1
>>> +
>>> +            if not entry.startswith("F:"):
>>> +                continue
>>> +            entry = entry[2:].strip()
>>> +            found_file_entry = True
>>> +
>>> +            file_exists = len(glob.glob(entry, recursive=True)) > 0
>> 
>> I'm afraid this matches files not in git, just like my quick & dirty
>> one-liner.  Shouldn't we match against contents of HEAD, say output of
>> "git-ls-tree -r --name-only @"?
>>
>
> I don't think it's needed to restrict to git ls-tree. The only risk is
> that people have a local file they forgot (or didn't want) to add in
> git. It will be caught by CI that won't have such a file, so we're safe.
>
> What do you think?

Yes, we're safe, but the earlier we catch mistakes, the better.  Now,
the juice isn't always worth the squeeze.  How hard would we have to
squeeze here?  We could use fnmatch.filter(names, pat) to test whether
@pat matches anything in @names, where @names is from git-ls-tree.

>>> +            if file_exists:
>>> +                continue
>>> +
>>> +            found_incorrect_entries = True
>>> +            print(
>>> +                f"No matching files for {args.maintainers} +{line_counter}: {entry}",
>>> +                file=sys.stderr,
>>> +            )
>>> +
>>> +    if not found_file_entry:
>>> +        raise Exception("no file entry found - is MAINTAINERS path correct?")
>>> +    if found_incorrect_entries:
>>> +        raise Exception(f"incorrect entries found in {args.maintainers}")
>>> +
>>> +
>>> +if __name__ == "__main__":
>>> +    main()
>> 
>
> Regards,
> Pierrick

Re: [PATCH 00/39] MAINTAINERS: Fix F: lines

[Pierrick Bouvier]

On 6/2/2026 12:00 AM, Markus Armbruster wrote:
> Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:
> 
>> On 6/1/2026 3:06 AM, Markus Armbruster wrote:
>>> Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:
>>>
>>>> Hi Markus,
>>>>
>>>> On 5/21/2026 1:04 AM, Markus Armbruster wrote:
>>>>> Quite a few F: lines don't match any files.  The quick & dirty check
>>>>>
>>>>>     $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null
>>>>>
>>>>> finds about fifty.
>>>>>
>>>>> Philippe Mathieu-Daudé recently posted a few fixes:
>>>>>
>>>>>   MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>>>>>   MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
>>>>>   MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
>>>>>   MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
>>>>>   MAINTAINERS: Cover python.docker with Python library section
>>>>>   MAINTAINERS: Fix s390x storage key/attribute device paths
>>>>>   MAINTAINERS: Fix tcg/s390x/ path
>>>>>   MAINTAINERS: Correct scripts/coverity-model.c path
>>>>>   MAINTAINERS: Fix hexagon-linux-user.mak path
> 
> [...]
> 
>>>> In addition, see the patch attached to this email.
>>>> It integrates checking this directly at configure time, so we never run
>>>> into any missing entry again in the future.
>>>>
>>>> I share this here not for a review, but simply to avoid a duplicated
>>>> effort, and make sure people know it will be sent after this series.
>>>>
>>>> I don't believe in adding this in checkpatch, because it's not enforced
>>>> systematically unfortunately. Breaking the meson configuration is a good
>>>> way to make sure it's enforced by design.
>>>
>>> No objection.
>>>
>>>> With your series applied, the left entries are:
>>>
>>> Most of these are fixed in Philippe's patches mentioned above.
>>>
>>
>> 👍
>>
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +258:
>>>> configs/targets/hexagon-linux-user/default.mak
>>>
>>> MAINTAINERS: Fix hexagon-linux-user.mak path
>>>
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +259:
>>>> docker/dockerfiles/debian-hexagon-cross.docker
>>>
>>> MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>>>
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2956:
>>>> hw/s390x/storage-keys.h
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +2965:
>>>> hw/s390x/storage-attributes.h
>>>
>>> MAINTAINERS: Fix s390x storage key/attribute device paths
>>>
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3241:
>>>> scripts/coverity-model.c
>>>
>>> MAINTAINERS: Correct scripts/coverity-model.c path
>>>
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +3468:
>>>> tests/*.py
>>>
>>> This is the exception I mentioned above.
>>>
>>> The intent is to match *.py below tests/.  It actually matches only in
>>> tests/, not in its subdirectories.
>>>
>>> Here's a dumb fix:
>>>
>>>     F: tests/*.py
>>>     F: tests/*/*.py
>>>     F: tests/*/*/*.py
>>>     F: tests/*/*/*/*.py
>>>
>>
>> It's acceptable, and nice because it's not ambiguous.
>> Also, it shows us the first line is not a correct entry (there is no
>> tests/*.py).
> 
> It's also brittle: breaks when we add the first .py at level.
> 
>>> for however many levels we have.  Same for the scripts/ line next to it.
>>> Blech.
>>>
>>> The smart fix might be to port N: from the kernel.
>>>
>>> 	N: Files and directories *Regex* patterns.
>>> 	   N:	[^a-z]tegra	all files whose path contains tegra
>>> 	                        (not including files like integrator)
>>> 	   One pattern per line.  Multiple N: lines acceptable.
>>> 	   scripts/get_maintainer.pl has different behavior for files that
>>> 	   match F: pattern and matches of N: patterns.  By default,
>>> 	   get_maintainer will not look at git log history when an F: pattern
>>> 	   match occurs.  When an N: match occurs, git log history is used
>>> 	   to also notify the people that have git commit signatures.
>>>
>>> But I wonder: is this section useful at all?
>>
>> I would prefer to use the manual entries approach above, especially if
>> there is only folder that is concerned.
>> When we'll have two different use case, maybe we can consider a more
>> generic approach.
> 
> I'm aware of just two:
> 
>     Python scripts
>     M: John Snow <jsnow@redhat.com>
>     M: Cleber Rosa <crosa@redhat.com>
>     S: Odd Fixes
>     F: scripts/*.py
>     F: tests/*.py
> 
> The section was added almost a decade ago (commit ad904f6689f), and
> never worked as intended.  I asked John Snow about deleting it to
> unblock your work.  He told me he'd be fine with that.  Could add it
> back later fixed.
> 
>>>> No matching files for /usr2/pbouvier/.work/qemu/MAINTAINERS +4149:
>>>> tcg/s390/
>>>
>>> MAINTAINERS: Fix tcg/s390x/ path
>>>
>>>> Once your current series is pulled, I'll fix the remaining and send the
>>>> attached patch. Or feel free to do it directly if you like the idea :)
>>>>
>>>> Regards,
>>>> Pierrick
>>>
>>> Two remarks inline.
>>>
>>>> From 6c9b49ac7ec06c0159d2b4ba9c9d1081e02ef765 Mon Sep 17 00:00:00 2001
>>>> From: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>>>> Date: Fri, 22 May 2026 12:23:17 -0700
>>>> Subject: [PATCH] meson.build: check MAINTAINERS file is consistent with source
>>>>  tree
>>>>
>>>> We add a new script: scripts/check-maintainers-file.py, that will run at
>>>> configuration time (and not at build time), to not hurt build time.
>>>> This script runs in 0.2s on my dev VM, which has an old cpu.
>>>>
>>>> We can expect things to be mostly in sync since adding or removing a
>>>> source or test file will trigger a configure step.
>>>> For the rest, like docs, tcg tests, or remaining files, GitLab CI will
>>>> build things from scratch and always run the configure step.
>>>>
>>>> With this, it should be impossible by design to have an upstream
>>>> MAINTAINERS file with non existing file entries.
>>>>
>>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>>>> ---
>>>>  meson.build                       |  5 +++
>>>>  scripts/check-maintainers-file.py | 53 +++++++++++++++++++++++++++++++
>>>>  2 files changed, 58 insertions(+)
>>>>  create mode 100755 scripts/check-maintainers-file.py
>>>>
>>>> diff --git a/meson.build b/meson.build
>>>> index eeb096c1487..ddfb0b90ca6 100644
>>>> --- a/meson.build
>>>> +++ b/meson.build
>>>> @@ -18,6 +18,11 @@ add_test_setup('thorough',
>>>>  
>>>>  meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
>>>>  
>>>> +# check our MAINTAINERS file is consistent
>>>> +check_maintainers = find_program('scripts/check-maintainers-file.py')
>>>> +maintainers_file = files('MAINTAINERS')
>>>> +run_command([check_maintainers, maintainers_file], check: true, console: true)
>>>
>>> My version of meson (1.8.5) chokes on console: true.  According to
>>> https://mesonbuild.com/Reference-manual_functions_run_command.html#run_command_console
>>> it's new in 1.11.0.
>>>
>>
>> Our configure script creates a venv with an updated version of meson,
>> which is 1.11.1 at the moment.
>> If you called meson directly (which uses your host meson), it's not how
>> we're supposed to build QEMU.
>> How did you try this?
> 
> I ran make :)
> 
>>> I tested with it deleted.
>>>
>>>> +
>>>>  ####################
>>>>  # Global variables #
>>>>  ####################
>>>> diff --git a/scripts/check-maintainers-file.py b/scripts/check-maintainers-file.py
>>>> new file mode 100755
>>>> index 00000000000..b001816a401
>>>> --- /dev/null
>>>> +++ b/scripts/check-maintainers-file.py
>>>> @@ -0,0 +1,53 @@
>>>> +#! /usr/bin/env python3
>>>> +
>>>> +# Check incorrect file entries in MAINTAINERS
>>>> +#
>>>> +# Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
>>>> +#
>>>> +# SPDX-License-Identifier: GPL-2.0-or-later
>>>> +
>>>> +import argparse
>>>> +import glob
>>>> +import sys
>>>> +
>>>> +
>>>> +def check_one_entry(line) -> bool:
>>>> +    return True
>>>> +
>>>> +
>>>> +def main() -> None:
>>>> +    parser = argparse.ArgumentParser(description="Check MAINTAINERS file")
>>>> +    parser.add_argument("maintainers", help="Path to MAINTAINERS file")
>>>> +    args = parser.parse_args()
>>>> +
>>>> +    found_file_entry = False
>>>> +    found_incorrect_entries = False
>>>> +    line_counter = 0
>>>> +
>>>> +    with open(args.maintainers) as file:
>>>> +        for entry in file:
>>>> +            line_counter += 1
>>>> +
>>>> +            if not entry.startswith("F:"):
>>>> +                continue
>>>> +            entry = entry[2:].strip()
>>>> +            found_file_entry = True
>>>> +
>>>> +            file_exists = len(glob.glob(entry, recursive=True)) > 0
>>>
>>> I'm afraid this matches files not in git, just like my quick & dirty
>>> one-liner.  Shouldn't we match against contents of HEAD, say output of
>>> "git-ls-tree -r --name-only @"?
>>>
>>
>> I don't think it's needed to restrict to git ls-tree. The only risk is
>> that people have a local file they forgot (or didn't want) to add in
>> git. It will be caught by CI that won't have such a file, so we're safe.
>>
>> What do you think?
> 
> Yes, we're safe, but the earlier we catch mistakes, the better.  Now,
> the juice isn't always worth the squeeze.  How hard would we have to
> squeeze here?  We could use fnmatch.filter(names, pat) to test whether
> @pat matches anything in @names, where @names is from git-ls-tree.
>

"the earlier we catch mistakes, the better" is a good paradigm, but I
don't think we should project that to developer machine. The only thing
we need to keep "green" are our upstream branches.

I like the simplicity of current script, only dealing with file paths,
instead of having to do string regexp compare with git ls-files output,
but it's just a matter of personal taste and choosing the easiest
solution for a given problem.

That said, if filtering through git ls-files is a strong requirement, I
would be happy to implement it. Only thing that matters is that we have
something catching mistakes.

>>>> +            if file_exists:
>>>> +                continue
>>>> +
>>>> +            found_incorrect_entries = True
>>>> +            print(
>>>> +                f"No matching files for {args.maintainers} +{line_counter}: {entry}",
>>>> +                file=sys.stderr,
>>>> +            )
>>>> +
>>>> +    if not found_file_entry:
>>>> +        raise Exception("no file entry found - is MAINTAINERS path correct?")
>>>> +    if found_incorrect_entries:
>>>> +        raise Exception(f"incorrect entries found in {args.maintainers}")
>>>> +
>>>> +
>>>> +if __name__ == "__main__":
>>>> +    main()
>>>
>>
>> Regards,
>> Pierrick
> 

Re: [PATCH 00/39] MAINTAINERS: Fix F: lines

[Markus Armbruster]

Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:

> On 6/2/2026 12:00 AM, Markus Armbruster wrote:
>> Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:
>> 
>>> On 6/1/2026 3:06 AM, Markus Armbruster wrote:
>>>> Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> writes:
>>>>
>>>>> Hi Markus,
>>>>>
>>>>> On 5/21/2026 1:04 AM, Markus Armbruster wrote:
>>>>>> Quite a few F: lines don't match any files.  The quick & dirty check
>>>>>>
>>>>>>     $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null
>>>>>>
>>>>>> finds about fifty.
>>>>>>
>>>>>> Philippe Mathieu-Daudé recently posted a few fixes:
>>>>>>
>>>>>>   MAINTAINERS: Fix docker/dockerfiles/debian-hexagon-cross.docker path
>>>>>>   MAINTAINERS: Cover debian-loongarch-cross.docker with LoongArch section
>>>>>>   MAINTAINERS: Cover debian-xtensa-cross.docker with Xtensa section
>>>>>>   MAINTAINERS: Cover debian-tricore-cross.docker with TriCore section
>>>>>>   MAINTAINERS: Cover python.docker with Python library section
>>>>>>   MAINTAINERS: Fix s390x storage key/attribute device paths
>>>>>>   MAINTAINERS: Fix tcg/s390x/ path
>>>>>>   MAINTAINERS: Correct scripts/coverity-model.c path
>>>>>>   MAINTAINERS: Fix hexagon-linux-user.mak path

[...]

>>>> I'm afraid this matches files not in git, just like my quick & dirty
>>>> one-liner.  Shouldn't we match against contents of HEAD, say output of
>>>> "git-ls-tree -r --name-only @"?
>>>>
>>>
>>> I don't think it's needed to restrict to git ls-tree. The only risk is
>>> that people have a local file they forgot (or didn't want) to add in
>>> git. It will be caught by CI that won't have such a file, so we're safe.
>>>
>>> What do you think?
>> 
>> Yes, we're safe, but the earlier we catch mistakes, the better.  Now,
>> the juice isn't always worth the squeeze.  How hard would we have to
>> squeeze here?  We could use fnmatch.filter(names, pat) to test whether
>> @pat matches anything in @names, where @names is from git-ls-tree.
>>
>
> "the earlier we catch mistakes, the better" is a good paradigm, but I
> don't think we should project that to developer machine. The only thing
> we need to keep "green" are our upstream branches.
>
> I like the simplicity of current script, only dealing with file paths,
> instead of having to do string regexp compare with git ls-files output,
> but it's just a matter of personal taste and choosing the easiest
> solution for a given problem.
>
> That said, if filtering through git ls-files is a strong requirement, I
> would be happy to implement it. Only thing that matters is that we have
> something catching mistakes.

It's what I would do, but that does *not* make it a requirement, let
alone a strong one.  I'm not the maintainer here.  You, however, are the
patch's author :)

If you want simple, consider

    $ ls `sed -n 's/^F: *//p' MAINTAINERS ` >/dev/null

[...]