[PATCH v2 00/38] MAINTAINERS: Fix F: lines

[PATCH v2 00/38] 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 RISCV related paths
  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 RISCV related paths
   Date: Tue, 19 May 2026 19:26:21 +0200
   Message-ID: <20260519172621.98469-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
next.  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.

v2:
* Cc: philmd updated to new e-mail address
* Old PATCH 04 and XXX dropped, use Philippe's prior patch
* PATCH 10: New
* PATCH 14+36: Commit message fixed
* PATCH 22: Commit message and Cc: fixed

Markus Armbruster (38):
  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 "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 "Darwin (macOS, iOS)"
  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: 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-user-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 | 71 ++++++++++++++++++-----------------------------------
 1 file changed, 24 insertions(+), 47 deletions(-)

-- 
2.54.0

[PATCH v2 01/38] 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@mailo.com> (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@mailo.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 75b88d07d3..3637b4a235 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -531,7 +531,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@mailo.com>
-- 
2.54.0

[PATCH v2 02/38] 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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
 MAINTAINERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3637b4a235..2c7f2985ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2837,7 +2837,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
@@ -4462,7 +4462,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>
@@ -4474,7 +4474,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

[PATCH v2 03/38] 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 2c7f2985ff..727e3dabd0 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

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

[Philippe Mathieu-Daudé]

On 3/6/26 08:39, Markus Armbruster wrote:
> 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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 04/38] 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 727e3dabd0..37741e21c4 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 v2 05/38] 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 37741e21c4..15793b088e 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

Re: [PATCH v2 05/38] MAINTAINERS: Drop stale F: from "Overall KVM CPUs"

[Philippe Mathieu-Daudé]

On 3/6/26 08:39, Markus Armbruster wrote:
> 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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 06/38] 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@mailo.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 15793b088e..2dc53c7e2e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -541,8 +541,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

Re: [PATCH v2 06/38] MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> 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@mailo.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 15793b088e..2dc53c7e2e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -541,8 +541,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

Adding:

   +F: accel/meson.build

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

>   F: cpu-common.c
>   F: cpu-target.c
>   F: qapi/accelerator.json

Re: [PATCH v2 06/38] MAINTAINERS: Drop stale F: from "Overall CPUs other accelerators"

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@mailo.com> writes:

> On 3/6/26 08:40, Markus Armbruster wrote:
>> 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@mailo.com>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>   MAINTAINERS | 2 --
>>   1 file changed, 2 deletions(-)
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 15793b088e..2dc53c7e2e 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -541,8 +541,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
>
> Adding:
>
>   +F: accel/meson.build

Will do.

> Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

Thanks!

>>   F: cpu-common.c
>>   F: cpu-target.c
>>   F: qapi/accelerator.json

[PATCH v2 07/38] 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 2dc53c7e2e..26feb68c0c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2423,7 +2423,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 v2 08/38] 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 26feb68c0c..269c26196d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -550,7 +550,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

Re: [PATCH v2 08/38] MAINTAINERS: Fix F: in "Apple Silicon HVF CPUs"

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> 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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 09/38] 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>
Reviewed-by: Anthony PERARD <anthony@xenproject.org>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 269c26196d..3a99c84839 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -634,7 +634,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

[PATCH v2 10/38] MAINTAINERS: Fix F: in "Darwin (macOS, iOS)"

[Markus Armbruster]

We neglected to update MAINTAINERS when we deleted
.gitlab-ci.d/cirrus/macos-14.vars, and when we added
.gitlab-ci.d/macos*.  Update it now.

Fixes: 984b192bdf (ci: drop cirrus MacOS build, 2026-05-26)
Fixes: 7684e78132 (gitlab: add initial MacOS 15 on gitlab runner, 2026-05-26)
Cc: Philippe Mathieu-Daudé <philmd@mailo.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 3a99c84839..2bf421c659 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -692,7 +692,7 @@ F: scripts/nsis.py
 Darwin (macOS, iOS)
 M: Philippe Mathieu-Daudé <philmd@mailo.com>
 S: Odd Fixes
-F: .gitlab-ci.d/cirrus/macos-*
+F: .gitlab-ci.d/macos*
 F: */*.m
 F: scripts/entitlement.sh
 
-- 
2.54.0

Re: [PATCH v2 10/38] MAINTAINERS: Fix F: in "Darwin (macOS, iOS)"

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we deleted
> .gitlab-ci.d/cirrus/macos-14.vars, and when we added
> .gitlab-ci.d/macos*.  Update it now.
> 
> Fixes: 984b192bdf (ci: drop cirrus MacOS build, 2026-05-26)
> Fixes: 7684e78132 (gitlab: add initial MacOS 15 on gitlab runner, 2026-05-26)
> Cc: Philippe Mathieu-Daudé <philmd@mailo.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 3a99c84839..2bf421c659 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -692,7 +692,7 @@ F: scripts/nsis.py
>   Darwin (macOS, iOS)
>   M: Philippe Mathieu-Daudé <philmd@mailo.com>
>   S: Odd Fixes
> -F: .gitlab-ci.d/cirrus/macos-*
> +F: .gitlab-ci.d/macos*

Ah, slighly better than 20260602162457.828969-4-stefanha@redhat.com.

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

>   F: */*.m
>   F: scripts/entitlement.sh
>   

Re: [PATCH v2 10/38] MAINTAINERS: Fix F: in "Darwin (macOS, iOS)"

[Stefan Hajnoczi]

On Wed, Jun 3, 2026 at 4:26 AM Philippe Mathieu-Daudé <philmd@mailo.com> wrote:
>
> On 3/6/26 08:40, Markus Armbruster wrote:
> > We neglected to update MAINTAINERS when we deleted
> > .gitlab-ci.d/cirrus/macos-14.vars, and when we added
> > .gitlab-ci.d/macos*.  Update it now.
> >
> > Fixes: 984b192bdf (ci: drop cirrus MacOS build, 2026-05-26)
> > Fixes: 7684e78132 (gitlab: add initial MacOS 15 on gitlab runner, 2026-05-26)
> > Cc: Philippe Mathieu-Daudé <philmd@mailo.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 3a99c84839..2bf421c659 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -692,7 +692,7 @@ F: scripts/nsis.py
> >   Darwin (macOS, iOS)
> >   M: Philippe Mathieu-Daudé <philmd@mailo.com>
> >   S: Odd Fixes
> > -F: .gitlab-ci.d/cirrus/macos-*
> > +F: .gitlab-ci.d/macos*
>
> Ah, slighly better than 20260602162457.828969-4-stefanha@redhat.com.
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

Yes, please take Markus' patch instead of mine since it includes the new files.

Stefan

[PATCH v2 11/38] 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>
Reviewed-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2bf421c659..c80c868526 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -703,7 +703,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

[PATCH v2 12/38] 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 c80c868526..b1dcd3a596 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -727,7 +727,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

Re: [PATCH v2 12/38] MAINTAINERS: Fix F: in "Allwinner-a10"

[Strahinja Jankovic]

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

Thanks!

Reviewed-by: Strahinja Jankovic <strahinja.p.jankovic@gmail.com>


On Wed, Jun 3, 2026, 8:40 AM Markus Armbruster <armbru@redhat.com> wrote:

> 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 c80c868526..b1dcd3a596 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -727,7 +727,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
>
>

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

[PATCH v2 13/38] 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@mailo.com>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b1dcd3a596..367d37f40a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1009,8 +1009,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
 R: Philippe Mathieu-Daudé <philmd@mailo.com>
 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

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

[Markus Armbruster]

include/hw/misc/zynq_slcr.h 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 367d37f40a..8b28a21fe4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1141,7 +1141,6 @@ F: hw/misc/xlnx-zynq-ddrc.c
 F: hw/misc/zynq_slcr.c
 F: hw/adc/zynq-xadc.c
 F: include/hw/misc/xlnx-zynq-ddrc.h
-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

Re: [PATCH v2 14/38] MAINTAINERS: Drop bad F: from "Xilinx Zynq"

[Alistair Francis]

On Wed, Jun 3, 2026 at 4:44 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> include/hw/misc/zynq_slcr.h 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>

Reviewed-by: Alistair Francis <alistair@alistair23.me>

Alistair

> ---
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 367d37f40a..8b28a21fe4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1141,7 +1141,6 @@ F: hw/misc/xlnx-zynq-ddrc.c
>  F: hw/misc/zynq_slcr.c
>  F: hw/adc/zynq-xadc.c
>  F: include/hw/misc/xlnx-zynq-ddrc.h
> -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 v2 15/38] 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 8b28a21fe4..9f45d7fa8d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1564,7 +1564,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

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

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> 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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 16/38] 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>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9f45d7fa8d..f7e449c124 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1630,7 +1630,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

[PATCH v2 17/38] 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 f7e449c124..ad56da5ca0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1689,7 +1689,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 v2 18/38] 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 ad56da5ca0..815ec48686 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2233,7 +2233,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 v2 19/38] 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 815ec48686..0c952b710b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2295,7 +2295,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

Re: [PATCH v2 19/38] MAINTAINERS: Fix F: in "SSI"

[Alistair Francis]

On Wed, Jun 3, 2026 at 4:42 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> 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>

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

Alistair

> ---
>  MAINTAINERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 815ec48686..0c952b710b 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2295,7 +2295,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 v2 20/38] 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 0c952b710b..f421a3ecdf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2397,7 +2397,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

Re: [PATCH v2 20/38] MAINTAINERS: Fix F: in "vhost"

[Stefano Garzarella]

On Wed, Jun 03, 2026 at 08:40:14AM +0200, Markus Armbruster wrote:
>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(-)

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

>
>diff --git a/MAINTAINERS b/MAINTAINERS
>index 0c952b710b..f421a3ecdf 100644
>--- a/MAINTAINERS
>+++ b/MAINTAINERS
>@@ -2397,7 +2397,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 v2 21/38] 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 f421a3ecdf..0f8fa52550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2487,7 +2487,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 v2 22/38] MAINTAINERS: Fix bad / stale F: in "virtio-user-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: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f8fa52550..e01850d502 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2537,11 +2537,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

[PATCH v2 23/38] 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 e01850d502..9596788433 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2532,7 +2532,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 v2 24/38] 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>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9596788433..a3a233e6b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2609,7 +2609,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>
@@ -2798,7 +2798,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

[PATCH v2 25/38] 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index a3a233e6b6..743da50c9d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2713,7 +2713,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

[PATCH v2 26/38] 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>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 743da50c9d..9617a57e04 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3136,7 +3136,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 v2 26/38] MAINTAINERS: Drop stale F: from "Block I/O path"

[Stefan Hajnoczi]

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

On Wed, Jun 03, 2026 at 08:40:20AM +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>
> Reviewed-by: Stefan Hajnoczi <stefanha@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 v2 27/38] 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 9617a57e04..57510a323f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3263,7 +3263,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

[PATCH v2 28/38] 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>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 57510a323f..4d7f7196bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3414,7 +3414,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

[PATCH v2 29/38] 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 4d7f7196bc..d87426c255 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3571,7 +3571,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

[PATCH v2 30/38] 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 d87426c255..175f32fbfc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3587,12 +3587,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

Re: [PATCH v2 30/38] MAINTAINERS: Fix F: in "QMP"

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> 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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 31/38] 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>
Reviewed-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 175f32fbfc..9f3c7f591d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3961,7 +3961,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

[PATCH v2 32/38] 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@mailo.com>
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 9f3c7f591d..5cd5eed287 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4001,7 +4001,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

Re: [PATCH v2 32/38] MAINTAINERS: Drop stale F: from "EDK2 Firmware"

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> 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@mailo.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   MAINTAINERS | 1 -
>   1 file changed, 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 33/38] 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>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5cd5eed287..71383b9807 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4164,7 +4164,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

[PATCH v2 34/38] 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>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 71383b9807..c5b6985767 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4331,7 +4331,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 v2 34/38] MAINTAINERS: Drop stale F: from "Linux io_uring"

[Stefan Hajnoczi]

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

On Wed, Jun 03, 2026 at 08:40:28AM +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>
> Reviewed-by: Stefan Hajnoczi <stefanha@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 --]

Re: [PATCH v2 34/38] MAINTAINERS: Drop stale F: from "Linux io_uring"

[Stefano Garzarella]

On Wed, Jun 03, 2026 at 08:40:28AM +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>
>Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
>---
> MAINTAINERS | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/MAINTAINERS b/MAINTAINERS
>index 71383b9807..c5b6985767 100644
>--- a/MAINTAINERS
>+++ b/MAINTAINERS
>@@ -4331,7 +4331,6 @@ R: Stefano Garzarella <sgarzare@redhat.com>
> L: qemu-block@nongnu.org
> S: Maintained
> F: block/io_uring.c
>-F: stubs/io_uring.c

Should we add `util/fdmon-io_uring.c` in this list ?

BTW this is unrelated to this patch that LGTM:

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

>
> qcow2
> M: Kevin Wolf <kwolf@redhat.com>
>-- 
>2.54.0
>

Re: [PATCH v2 34/38] MAINTAINERS: Drop stale F: from "Linux io_uring"

[Stefan Hajnoczi]

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

On Thu, Jun 04, 2026 at 03:17:52PM +0200, Stefano Garzarella wrote:
> On Wed, Jun 03, 2026 at 08:40:28AM +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>
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> > ---
> > MAINTAINERS | 1 -
> > 1 file changed, 1 deletion(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 71383b9807..c5b6985767 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -4331,7 +4331,6 @@ R: Stefano Garzarella <sgarzare@redhat.com>
> > L: qemu-block@nongnu.org
> > S: Maintained
> > F: block/io_uring.c
> > -F: stubs/io_uring.c
> 
> Should we add `util/fdmon-io_uring.c` in this list ?

No, this section is under "Block drivers" and is specifically for qcow2,
iscsi, raw, etc.

util/fdmon-io_uring.c is covered by util/fdmon-*.c in "Block I/O path",
which is where AioContext and QEMU's event loop lives. The name "Block
I/O path" is not the best fit anymore and maybe it should be changed to
"AioContext event loop".

> 
> BTW this is unrelated to this patch that LGTM:
> 
> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
> 
> > 
> > qcow2
> > M: Kevin Wolf <kwolf@redhat.com>
> > -- 
> > 2.54.0
> > 
> 

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

Re: [PATCH v2 34/38] MAINTAINERS: Drop stale F: from "Linux io_uring"

[Stefano Garzarella]

On Thu, Jun 04, 2026 at 10:29:19AM -0400, Stefan Hajnoczi wrote:
>On Thu, Jun 04, 2026 at 03:17:52PM +0200, Stefano Garzarella wrote:
>> On Wed, Jun 03, 2026 at 08:40:28AM +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>
>> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
>> > ---
>> > MAINTAINERS | 1 -
>> > 1 file changed, 1 deletion(-)
>> >
>> > diff --git a/MAINTAINERS b/MAINTAINERS
>> > index 71383b9807..c5b6985767 100644
>> > --- a/MAINTAINERS
>> > +++ b/MAINTAINERS
>> > @@ -4331,7 +4331,6 @@ R: Stefano Garzarella <sgarzare@redhat.com>
>> > L: qemu-block@nongnu.org
>> > S: Maintained
>> > F: block/io_uring.c
>> > -F: stubs/io_uring.c
>>
>> Should we add `util/fdmon-io_uring.c` in this list ?
>
>No, this section is under "Block drivers" and is specifically for qcow2,
>iscsi, raw, etc.

Oops, I missed we have sections in the MAINTAINERS file. I thought this 
entry was a generic one for io_uring support in QEMU.

>
>util/fdmon-io_uring.c is covered by util/fdmon-*.c in "Block I/O path",
>which is where AioContext and QEMU's event loop lives. 

Okay, makes sense to me, thanks for the clarification.

> The name "Block
>I/O path" is not the best fit anymore and maybe it should be changed to
>"AioContext event loop".

yeah, I agree.

Thanks,
Stefano

>
>>
>> BTW this is unrelated to this patch that LGTM:
>>
>> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
>>
>> >
>> > qcow2
>> > M: Kevin Wolf <kwolf@redhat.com>
>> > --
>> > 2.54.0
>> >
>>

[PATCH v2 35/38] 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>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: John Levon <john.levon@nutanix.com>
---
 MAINTAINERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index c5b6985767..0a0e9a736d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4450,8 +4450,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

[PATCH v2 36/38] MAINTAINERS: Fix F: in "Build and test automation"

[Markus Armbruster]

We neglected to update MAINTAINERS when we split off 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>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a0e9a736d..f6609dc5f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4473,7 +4473,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 v2 36/38] MAINTAINERS: Fix F: in "Build and test automation"

[Philippe Mathieu-Daudé]

On 3/6/26 08:40, Markus Armbruster wrote:
> We neglected to update MAINTAINERS when we split off 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>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@mailo.com>

[PATCH v2 37/38] 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 f6609dc5f3..2743faa1ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4596,13 +4596,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 v2 38/38] 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>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2743faa1ea..a94096428f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4611,7 +4611,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 v2 00/38] MAINTAINERS: Fix F: lines

[Philippe Mathieu-Daudé]

Hi Markus,

On 3/6/26 08:39, 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 RISCV related paths
>    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 RISCV related paths
>     Date: Tue, 19 May 2026 19:26:21 +0200
>     Message-ID: <20260519172621.98469-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
> next.  It applies cleanly with and without Philippe's patches.

Not sure if you are expecting something from me here, I dropped
these thinking you'd include them in your cleanup series or in
a PR.

Friendly recommendation: merge what is already review and repost
what is not in 1 week, do not wait for all the 38 patches to be
reviewed before posting your PR, that'd be exhausting. Or even,
do not repost in 1 week, directly send your PR; these patches
have been long enough on the list.

Regards,

Phil.

Re: [PATCH v2 00/38] MAINTAINERS: Fix F: lines

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@mailo.com> writes:

> Hi Markus,
>
> On 3/6/26 08:39, 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 RISCV related paths
>>    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 RISCV related paths
>>     Date: Tue, 19 May 2026 19:26:21 +0200
>>     Message-ID: <20260519172621.98469-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
>> next.  It applies cleanly with and without Philippe's patches.
>
> Not sure if you are expecting something from me here, I dropped
> these thinking you'd include them in your cleanup series or in
> a PR.

I do not expect anything from you at this time.

Since my patches apply fine without yours, I posted them without yours.

If I post a PR for mine, I will of course include yours, along with
other MAINTAINERS patches that are ready, if any.

[...]