* [PULL 1/5] test-util-filemonitor: Adapt to FreeBSD 15's native inotify semantics
2026-07-21 15:55 [PULL 0/5] Misc patches Daniel P. Berrangé
@ 2026-07-21 15:55 ` Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 2/5] tests/vm: update to FreeBSD 14.4 image Daniel P. Berrangé
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrangé @ 2026-07-21 15:55 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Alex Bennée, Warner Losh,
Marc-André Lureau, Daniel P. Berrangé, Paolo Bonzini,
Kyle Evans, Li-Wen Hsu, Pierrick Bouvier, Jessica Clarke
From: Jessica Clarke <jrtc27@jrtc27.com>
FreeBSD 15 introduces a native inotify implementation rather than
requiring use of the kqueue-based libinotify package. This native
implementation does not generate the extra deleted events, so don't
expect them. However, the original implementation did have a bug that
caused IN_IGNORED to never be generated if you did not also watch for
IN_DELETE_SELF, which affects 15.0 and 15.1, but has been fixed and will
no longer apply in 15.2 / 16.0.
Note that the deleted event check is for the userspace version, since
that governs whether libinotify is being used or not, whereas the
ignored event check is both for the userspace version (to check if we're
using the native syscall) and the kernel version (to check if the kernel
has the bug or not).
All __FreeBSD_version values used here correspond to the value in-tree
at the time of the relevant commits. Since neither commit bumped the
value there will be a window of development snapshots between each
commit and the previous bump that will be incorrectly identified here,
but this is the best we can do, and something users of snapshots should
be prepared to deal with.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/unit/test-util-filemonitor.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/tests/unit/test-util-filemonitor.c b/tests/unit/test-util-filemonitor.c
index 02e67fc96a..972651dc1e 100644
--- a/tests/unit/test-util-filemonitor.c
+++ b/tests/unit/test-util-filemonitor.c
@@ -27,6 +27,10 @@
#include <utime.h>
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
+
enum {
QFILE_MONITOR_TEST_OP_ADD_WATCH,
QFILE_MONITOR_TEST_OP_DEL_WATCH,
@@ -221,6 +225,24 @@ qemu_file_monitor_test_expect(QFileMonitorTestData *data,
}
+static bool
+expect_broken_ignored(void)
+{
+#if defined(__FreeBSD__) && __FreeBSD_version >= 1500051
+ int osreldate;
+
+ osreldate = getosreldate();
+ if (osreldate == -1) {
+ g_printerr("Unable to call getosreldate: %s\n", strerror(errno));
+ abort();
+ }
+ return osreldate < 1501501 || (osreldate >= 1600000 && osreldate < 1600019);
+#else
+ return false;
+#endif
+}
+
+
static void
test_file_monitor_events(void)
{
@@ -360,7 +382,7 @@ test_file_monitor_events(void)
{ .type = QFILE_MONITOR_TEST_OP_EVENT,
.filesrc = "one.txt", .watchid = &watch4,
.eventid = QFILE_MONITOR_EVENT_DELETED },
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && __FreeBSD_version < 1500051
{ .type = QFILE_MONITOR_TEST_OP_EVENT,
.filesrc = "two.txt", .watchid = &watch0,
.eventid = QFILE_MONITOR_EVENT_DELETED },
@@ -539,6 +561,11 @@ test_file_monitor_events(void)
g_printerr("Event id=%" PRIx64 " event=%d file=%s\n",
*op->watchid, op->eventid, op->filesrc);
}
+ if (op->eventid == QFILE_MONITOR_EVENT_IGNORED &&
+ expect_broken_ignored()) {
+ g_printerr("Expect ignored event to be broken, skipping\n");
+ break;
+ }
if (!qemu_file_monitor_test_expect(&data, *op->watchid,
op->eventid, op->filesrc,
op->swapnext))
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PULL 2/5] tests/vm: update to FreeBSD 14.4 image
2026-07-21 15:55 [PULL 0/5] Misc patches Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 1/5] test-util-filemonitor: Adapt to FreeBSD 15's native inotify semantics Daniel P. Berrangé
@ 2026-07-21 15:55 ` Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 3/5] meson.build: re-add explicit gcrypt/nettle request check Daniel P. Berrangé
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrangé @ 2026-07-21 15:55 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Alex Bennée, Warner Losh,
Marc-André Lureau, Daniel P. Berrangé, Paolo Bonzini,
Kyle Evans, Li-Wen Hsu, Pierrick Bouvier,
Philippe Mathieu-Daudé
This avoids an interactive prompt that halts execution when
attempting to run the FreeBSD tests due to outdated 14.3
base image:
`Bootstrapping pkg from pkg+https://pkg.FreeBSD.org/FreeBSD:14:amd64/quarterly, please wait...
Verifying signature with trusted certificate pkg.freebsd.org.2013102301... done
Installing pkg-2.6.2_1...
Newer FreeBSD version for package pkg:
To ignore this error set IGNORE_OSVERSION=yes
- package: 1404000
- running userland: 1403000
Ignore the mismatch and continue? [y/N]:
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/vm/freebsd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index ea09b21fbc..bfb1a85af3 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM):
name = "freebsd"
arch = "x86_64"
- link = "https://download.freebsd.org/releases/CI-IMAGES/14.3-RELEASE/amd64/Latest/FreeBSD-14.3-RELEASE-amd64-BASIC-CI.raw.xz"
- csum = "ec0f5a4bbe63aa50a725d9fee0f1931f850e9a21cbebdadb991df00f168d6805"
+ link = "https://download.freebsd.org/releases/CI-IMAGES/14.4-RELEASE/amd64/Latest/FreeBSD-14.4-RELEASE-amd64-BASIC-CI.raw.xz"
+ csum = "627937af554eb6522891875ddc8cf5b86b40e9a12143c1b951f830b3f691de49"
size = "20G"
BUILD_SCRIPT = """
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PULL 3/5] meson.build: re-add explicit gcrypt/nettle request check
2026-07-21 15:55 [PULL 0/5] Misc patches Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 1/5] test-util-filemonitor: Adapt to FreeBSD 15's native inotify semantics Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 2/5] tests/vm: update to FreeBSD 14.4 image Daniel P. Berrangé
@ 2026-07-21 15:55 ` Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 4/5] gitlab: introduce files mapping GitLab accounts to real names Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 5/5] get_maintainer: add ability to report Git Lab handle Daniel P. Berrangé
4 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrangé @ 2026-07-21 15:55 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Alex Bennée, Warner Losh,
Marc-André Lureau, Daniel P. Berrangé, Paolo Bonzini,
Kyle Evans, Li-Wen Hsu, Pierrick Bouvier, Luc Michel
From: Luc Michel <luc.michel@amd.com>
c4b3d0074 removed the check that nettle or gcrypt were explicitly
requested as the crypto library to use, breaking the --enable-nettle and
--enable-gcrypt options. Re-add the logic to force usage of nettle or
gcrypt for crypto operations, while still keeping gnutls for TLS.
Fixes: c4b3d0074 (crypto: bump min gnutls to 3.7.5)
Tested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Luc Michel <luc.michel@amd.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
crypto/cipher.c | 2 +-
crypto/meson.build | 2 +-
meson.build | 11 ++++++++++-
tests/unit/test-crypto-block.c | 3 ++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/crypto/cipher.c b/crypto/cipher.c
index 515165e0dc..229710f76b 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -142,7 +142,7 @@ qcrypto_cipher_validate_key_length(QCryptoCipherAlgo alg,
#include "cipher-gcrypt.c.inc"
#elif defined CONFIG_NETTLE
#include "cipher-nettle.c.inc"
-#elif defined CONFIG_GNUTLS
+#elif defined CONFIG_GNUTLS_CRYPTO
#include "cipher-gnutls.c.inc"
#else
#include "cipher-stub.c.inc"
diff --git a/crypto/meson.build b/crypto/meson.build
index b51597a879..6ac83857aa 100644
--- a/crypto/meson.build
+++ b/crypto/meson.build
@@ -38,7 +38,7 @@ if nettle.found()
endif
elif gcrypt.found()
crypto_ss.add(gcrypt, files('hash-gcrypt.c', 'hmac-gcrypt.c', 'pbkdf-gcrypt.c'))
-elif gnutls.found()
+elif gnutls_crypto.found()
crypto_ss.add(gnutls, files('hash-gnutls.c', 'hmac-gnutls.c', 'pbkdf-gnutls.c'))
else
crypto_ss.add(files('hash-glib.c', 'hmac-glib.c', 'pbkdf-stub.c'))
diff --git a/meson.build b/meson.build
index 164328ded8..06c43b4358 100644
--- a/meson.build
+++ b/meson.build
@@ -1783,11 +1783,13 @@ if not get_option('libcbor').auto() or have_system
endif
gnutls = not_found
+gnutls_crypto = not_found
gnutls_bug1717_workaround = false
if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_system)
gnutls = dependency('gnutls', version: '>=3.7.5',
method: 'pkg-config',
required: get_option('gnutls'))
+ gnutls_crypto = gnutls
#if gnutls.found() and not get_option('gnutls-bug1717-workaround').disabled()
# XXX: when bug 1717 is resolved, add logic to probe for
@@ -1811,7 +1813,12 @@ if get_option('nettle').enabled() and get_option('gcrypt').enabled()
error('Only one of gcrypt & nettle can be enabled')
endif
-if not gnutls.found()
+# Explicit nettle/gcrypt request, so ignore gnutls for crypto
+if get_option('nettle').enabled() or get_option('gcrypt').enabled()
+ gnutls_crypto = not_found
+endif
+
+if not gnutls_crypto.found()
if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
gcrypt = dependency('libgcrypt', version: '>=1.9.4',
required: get_option('gcrypt'))
@@ -2513,6 +2520,7 @@ config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
config_host_data.set('CONFIG_KEYUTILS', keyutils.found())
config_host_data.set('CONFIG_GETTID', has_gettid)
config_host_data.set('CONFIG_GNUTLS', gnutls.found())
+config_host_data.set('CONFIG_GNUTLS_CRYPTO', gnutls_crypto.found())
config_host_data.set('CONFIG_GNUTLS_BUG1717_WORKAROUND', gnutls_bug1717_workaround)
config_host_data.set('CONFIG_TASN1', tasn1.found())
config_host_data.set('CONFIG_GCRYPT', gcrypt.found())
@@ -4865,6 +4873,7 @@ summary_info = {}
summary_info += {'TLS priority': get_option('tls_priority')}
summary_info += {'GNUTLS support': gnutls}
if gnutls.found()
+ summary_info += {' GNUTLS crypto': gnutls_crypto.found()}
summary_info += {' GNUTLS bug 1717 workaround': gnutls_bug1717_workaround }
endif
summary_info += {'libgcrypt': gcrypt}
diff --git a/tests/unit/test-crypto-block.c b/tests/unit/test-crypto-block.c
index 218e585f98..3ac7f17b2a 100644
--- a/tests/unit/test-crypto-block.c
+++ b/tests/unit/test-crypto-block.c
@@ -31,7 +31,8 @@
#endif
#if (defined(_WIN32) || defined RUSAGE_THREAD) && \
- (defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT))
+ (defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT) || \
+ defined(CONFIG_GNUTLS_CRYPTO))
#define TEST_LUKS
#else
#undef TEST_LUKS
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PULL 4/5] gitlab: introduce files mapping GitLab accounts to real names
2026-07-21 15:55 [PULL 0/5] Misc patches Daniel P. Berrangé
` (2 preceding siblings ...)
2026-07-21 15:55 ` [PULL 3/5] meson.build: re-add explicit gcrypt/nettle request check Daniel P. Berrangé
@ 2026-07-21 15:55 ` Daniel P. Berrangé
2026-07-21 15:55 ` [PULL 5/5] get_maintainer: add ability to report Git Lab handle Daniel P. Berrangé
4 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrangé @ 2026-07-21 15:55 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Alex Bennée, Warner Losh,
Marc-André Lureau, Daniel P. Berrangé, Paolo Bonzini,
Kyle Evans, Li-Wen Hsu, Pierrick Bouvier, Fabiano Rosas
It is desirable to be able to discover the GitLab account handle
assocaited with a real name in the MAINTAINERS file.
Rather that duplicating the same account handle multiple times,
inline with the MAINTAINERS file entries, this introduces mapping
files:
* .gitlab-map-auto - data automatically queried from GitLab
using the 'glab' tool and REST API
* .gitlab-map-manual - manual overrides/augmentation for
cases where the MAINTAINERS real name does not match the
GitLab account real name
The former would need refreshing when we add new MAINTAINERS
entries, if the person had to be added as a GitLab account
member. For this purpose scripts/gitlab-map-update can be
used, assuming the user has the 'glab' client tool present
and configured with an access token.
To audit how many maintainers have GitLab handles present/missing
scripts/gitlab-map-check can run a report.
$ ./scripts/gitlab-map-check
Missing GitLab handle for maintainer 'Akihiko Odaki'
Missing GitLab handle for maintainer 'Albert Esteve'
....
Missing GitLab handle for maintainer 'Zhenzhong Duan'
Missing GitLab handle for maintainer 'Zhuoying Cai'
GitLab handles missing: 158 / present: 68
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.gitlab-map-auto | 93 +++++++++++++++++++++++++++++++++++++++
.gitlab-map-manual | 18 ++++++++
scripts/gitlab-map-check | 51 +++++++++++++++++++++
scripts/gitlab-map-update | 45 +++++++++++++++++++
4 files changed, 207 insertions(+)
create mode 100644 .gitlab-map-auto
create mode 100644 .gitlab-map-manual
create mode 100755 scripts/gitlab-map-check
create mode 100755 scripts/gitlab-map-update
diff --git a/.gitlab-map-auto b/.gitlab-map-auto
new file mode 100644
index 0000000000..28ce448f1b
--- /dev/null
+++ b/.gitlab-map-auto
@@ -0,0 +1,93 @@
+# This file is auto-generated by scripts/gitlab-map-update
+#
+# This GitLab map associates GitLab account handles
+# with real names, in order to allow mapping from
+# MAINTAINERS entries. The format of entries is
+#
+# {gitlab-handle}<tab>{real name}
+#
+# Manual overrides must be placed in .gitlab-map-manual
+TaoTang Tao Tang
+a1xndr Alexander Bulekov
+adi-g15-ibm Aditya Gupta
+agraf Alexander Graf
+alex.williamson Alex Williamson
+aliang1 Aihua Liang
+alistair23 Alistair Francis
+anisinha Ani Sinha
+anthony-linaro Anthony Roberts
+anthonyper Anthony PERARD
+berrange Daniel P. Berrangé
+birkelund Klaus Jensen
+bonzini Paolo Bonzini
+brian-cain Brian Cain
+bsdimp Warner Losh
+cborntra Christian Borntraeger
+chao23.liu Chao Liu (Zevorn)
+cleber.gnu Cleber Rosa
+clegoate Cédric Le Goater
+cohuck Cornelia Huck
+cota_ Emilio Cota
+dagrh Dr. David Alan Gilbert
+danielhb Daniel Henrique Barboza
+davidhildenbrand David Hildenbrand
+dgibson dgibson
+dwmw2 David Woodhouse
+eauger1 Eric Auger
+ebblake Eric Blake
+edgar.iglesias Edgar E. Iglesias
+ehabkost Eduardo Habkost
+eldondev Eldon
+epilys Manos Pitsidianakis
+famzheng Fam Zheng
+farosas Fabiano Rosas
+gautammenghani Gautam Menghani
+gkurz Greg Kurz
+gusbromero Gustavo Romero
+harshpb Harsh Prateek Bora
+hdeller Helge Deller
+hreitz Hanna Czenczek
+imammedo Igor Mammedov
+jasowang Jason Wang
+jmacarthur Jim MacArthur
+jsnow John Snow
+juan.quintela Juan Quintela
+kbastian-qemu Bastian Koppelmann
+kmwolf Kevin Wolf
+kostyanf14 Kostiantyn Kostiuk
+kraxel Gerd Hoffmann
+lbmeng Bin Meng
+legoater Cédric Le Goater
+lvivier Laurent Vivier
+lygstate Yonggang Luo
+maciejsszmigiero Maciej S. Szmigiero
+marcandre.lureau Marc-André Lureau
+marcandre.lureau-rh Marc-André Lureau
+mauromatteo.cascella Mauro Matteo Cascella
+mcayland Mark Cave-Ayland
+mdroth Michael Roth
+mediouni-m M. Mediouni
+mjt0k Michael Tokarev
+mstredhat MST
+npiggin npiggin
+p-b-o Pierrick Bouvier
+pauldzim Paul Zimmerman
+peterx Peter Xu
+philmd Philippe Mathieu-Daudé
+pierrick.bouvier Pierrick Bouvier
+pipo.sk Peter Krempa
+pkrempa Peter Krempa (work)
+pm215 Peter Maydell
+qemu-janitor Qemu Janitor
+rathc Chinmay Rath
+rth7680 Richard Henderson
+schoenebeck Christian Schoenebeck
+sgarzarella Stefano Garzarella
+sstabellini Stefano Stabellini
+stefanberger Stefan Berger
+stefanha Stefan Hajnoczi
+stsquad Alex Bennée
+stweil Stefan Weil
+thuth Thomas Huth
+vsementsov Vladimir Sementsov-Ogievskiy
+xcancerberox Joaquin de Andres
diff --git a/.gitlab-map-manual b/.gitlab-map-manual
new file mode 100644
index 0000000000..f605a540e9
--- /dev/null
+++ b/.gitlab-map-manual
@@ -0,0 +1,18 @@
+# This GitLab map associates GitLab account handles
+# with real names, in order to allow mapping from
+# MAINTAINERS entries. The format of entries is
+#
+# {gitlab-handle}<tab>{real name}
+#
+# This file is manually written, to augment the
+# auto-generated data in .gitlab-map-auto. This
+# is needed where a GitLab account real name does
+# not exactly match the MAINTAINERS file real
+# name.
+#
+berrange Daniel P. Berrange
+dgibson David Gibson
+hreitz Hanna Reitz
+mstredhat Michael S. Tsirkin
+npiggin Nicholas Piggin
+mediouni-m Mohamed Mediouni
diff --git a/scripts/gitlab-map-check b/scripts/gitlab-map-check
new file mode 100755
index 0000000000..f72a06756d
--- /dev/null
+++ b/scripts/gitlab-map-check
@@ -0,0 +1,51 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+missing=0
+present=0
+
+grep -E '^(R|M):' MAINTAINERS | \
+sed -E -e 's/^(M|R): //' -e 's/ <.*//' | \
+sort | uniq > names.txt
+while IFS= read -r NAME
+do
+ grep "$NAME" .gitlab-map-{auto,manual} > /dev/null
+ if test $? != 0
+ then
+ echo "Missing GitLab handle for maintainer '$NAME'"
+ missing=$(($missing + 1))
+ else
+ present=$(($present + 1))
+ fi
+done < names.txt
+rm -f names.txt
+
+echo "GitLab handles missing: $missing / present: $present"
+
+# .gitlab-map-manual is to provide alternate real names
+# for cases where name in MAINTAINERS does not match
+# the GitLab account real name. As such...
+
+# ...all gitlab handles in .gitlab-map-manual must also exist
+# in .gitlab-map-auto and ....
+for HANDLE in $(grep -v '^#' .gitlab-map-manual | awk '{print $1}')
+do
+ grep -E "^$HANDLE\s" .gitlab-map-auto >/dev/null
+ if test $? != 0
+ then
+ echo "Unexpected GitLab handle '$HANDLE' is not a member"
+ fi
+done
+
+# ...and all realnames in .gitlab-map-manual must also
+# exist in MAINTAINERS
+grep -v '^#' .gitlab-map-manual | \
+awk '{ $1 = ""; print substr($0, 2) }' | \
+while IFS= read -r NAME
+do
+ grep -E "\s$NAME\s" MAINTAINERS >/dev/null
+ if test $? != 0
+ then
+ echo "Unexpected real name '$NAME' is not a maintainer"
+ fi
+done
diff --git a/scripts/gitlab-map-update b/scripts/gitlab-map-update
new file mode 100755
index 0000000000..c134c226aa
--- /dev/null
+++ b/scripts/gitlab-map-update
@@ -0,0 +1,45 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+echo "Checking authentication token status"
+glab auth status
+
+if test $? != 0
+then
+ echo "ERROR: not authenticated with gitlab.com"
+ exit 1
+fi
+
+if ! test -f .gitlab-map-auto
+then
+ echo "ERROR: cannot find existing '.gitlab-map-auto file'"
+ echo "ERROR: this must be executed from the root of the"
+ echo "ERROR: git repository checkout"
+ exit 1
+fi
+
+fail=0
+echo "Updating member list from qemu-project"
+glab api --paginate /groups/qemu-project/members | \
+ jq -r -c '.[] | [.username, .name] | @tsv' | \
+ grep -v '^group_3038080_bot' > \
+ .gitlab-map-auto.tmp
+test $? != 0 && fail=1
+
+echo "Updating member list from qemu-project/qemu"
+glab api --paginate /projects/qemu-project%2fqemu/members | \
+ jq -r -c '.[] | [.username, .name] | @tsv' | \
+ grep -v 'Duo Developer' >> \
+ .gitlab-map-auto.tmp
+test $? != 0 && fail=1
+
+if test $fail == 0
+then
+ grep '^#' .gitlab-map-auto > .gitlab-map-auto.new
+ LC_ALL=C sort .gitlab-map-auto.tmp | uniq >> .gitlab-map-auto.new
+ mv .gitlab-map-auto.new .gitlab-map-auto
+ echo "OK: GitLab member list updated"
+else
+ echo "ERROR: Updating member list failed"
+fi
+rm -f .gitlab-map-auto.tmp
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PULL 5/5] get_maintainer: add ability to report Git Lab handle
2026-07-21 15:55 [PULL 0/5] Misc patches Daniel P. Berrangé
` (3 preceding siblings ...)
2026-07-21 15:55 ` [PULL 4/5] gitlab: introduce files mapping GitLab accounts to real names Daniel P. Berrangé
@ 2026-07-21 15:55 ` Daniel P. Berrangé
4 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrangé @ 2026-07-21 15:55 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Alex Bennée, Warner Losh,
Marc-André Lureau, Daniel P. Berrangé, Paolo Bonzini,
Kyle Evans, Li-Wen Hsu, Pierrick Bouvier, Fabiano Rosas
With the GitLab mapping files from the previous commit, the
get_manitainer.pl script is now able to report the gitlab
handle for each maintainer/reviewer when displaying output.
For example:
$ ./scripts/get_maintainer.pl -f hw/scsi/lsi53c895a.c
Paolo Bonzini <pbonzini@redhat.com> (supporter:SCSI, gitlab:@bonzini)
Fam Zheng <fam@euphon.net> (reviewer:SCSI, gitlab:@famzheng)
qemu-devel@nongnu.org (open list:All patches CC here)
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
scripts/get_maintainer.pl | 53 ++++++++++++++++++++++++++++++++++++---
1 file changed, 49 insertions(+), 4 deletions(-)
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 76be402e11..473d133126 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -365,6 +365,31 @@ sub read_mailmap {
close($mailmap_file);
}
+my %gitlabmap;
+
+read_gitlabmap(".gitlab-map-auto");
+read_gitlabmap(".gitlab-map-manual");
+
+sub read_gitlabmap {
+ my $mapfile = shift;
+ open MAP, "<$mapfile"
+ or die "cannot open $mapfile: $!";
+
+ while (<MAP>) {
+ next if /^#/;
+ next if /^\s*$/;
+
+ if (/^(\S+)\t(.*)$/) {
+ my $handle = $1;
+ my $realname = $2;
+
+ $gitlabmap{$realname} = $handle;
+ }
+ }
+
+ close MAP;
+}
+
## use the filenames on the command line or find the filenames in the patchfiles
my @files = ();
@@ -1068,6 +1093,18 @@ sub email_inuse {
return 0;
}
+sub gitlab_handle {
+ my $name = shift;
+
+ $name =~ s/"//g;
+
+ my $gitlab_handle;
+ if (exists $gitlabmap{$name}) {
+ return $gitlabmap{$name};
+ }
+ return undef;
+}
+
sub push_email_address {
my ($line, $role) = @_;
@@ -1077,10 +1114,14 @@ sub push_email_address {
return 0;
}
+ my $gitlab_handle = gitlab_handle($name);
+
if (!$email_remove_duplicates) {
- push(@email_to, [format_email($name, $address, $email_usename), $role]);
+ push(@email_to, [format_email($name, $address, $email_usename),
+ $role, $gitlab_handle]);
} elsif (!email_inuse($name, $address)) {
- push(@email_to, [format_email($name, $address, $email_usename), $role]);
+ push(@email_to, [format_email($name, $address, $email_usename),
+ $role, $gitlab_handle]);
$email_hash_name{lc($name)}++ if ($name ne "");
$email_hash_address{lc($address)}++;
}
@@ -2026,10 +2067,14 @@ sub merge_email {
my %saw;
for (@_) {
- my ($address, $role) = @$_;
+ my ($address, $role, $gitlab_handle) = @$_;
if (!$saw{$address}) {
if ($output_roles) {
- push(@lines, "$address ($role)");
+ if (defined $gitlab_handle) {
+ push(@lines, "$address ($role, gitlab:\@$gitlab_handle)");
+ } else {
+ push(@lines, "$address ($role)");
+ }
} else {
push(@lines, $address);
}
--
2.55.0
^ permalink raw reply related [flat|nested] 6+ messages in thread