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

Markus Armbruster posted 39 patches 1 week, 2 days ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20260521080511.999266-1-armbru@redhat.com
MAINTAINERS | 73 ++++++++++++++++++-----------------------------------
1 file changed, 24 insertions(+), 49 deletions(-)
[PATCH 00/39] MAINTAINERS: Fix F: lines
Posted by Markus Armbruster 1 week, 2 days ago
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


Re: [PATCH 00/39] MAINTAINERS: Fix F: lines
Posted by Pierrick Bouvier 1 week ago
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,
PierrickFrom 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