[PATCH] vfio: selftests: Add luuid to libvfio.mk's list of libraries, not to the Makefile

From: Sean Christopherson

Date: Tue Jun 30 2026 - 17:32:18 EST


Link to the uuid library as part of libvfio.mk instead of as only linking
it via VFIO selftests' Makefile, as the whole point of providing libvfio.mk
is to allow linking the VFIO library functionality into KVM selftests,
without KVM selftests having to know the gory details or duplicate code.

Cc: Raghavendra Rao Ananta <rananta@xxxxxxxxxx>
Cc: David Matlack <dmatlack@xxxxxxxxxx>
Cc: Vipin Sharma <vipinsh@xxxxxxxxxx>
Cc: Alex Williamson <alex@xxxxxxxxxxx>
Fixes: e65f1bf8a2db ("vfio: selftests: Extend container/iommufd setup for passing vf_token")
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---

I would either like to land this in 7.2-rcN (ideally rc2 or rc3), or take it
through the KVM x86 tree for 7.3, as it's blocking a KVM selftest[*] that's
been in the works for more than a year. I can throw the IRQ selftest in its
own topic branch, so even 7.2-rc5 would be "fine", but I would much prefer to
get this (or an equivalent fix) into Linus' tree sooner than later.

[*] https://lore.kernel.org/all/20260626213534.3866178-1-seanjc@xxxxxxxxxx

tools/testing/selftests/vfio/Makefile | 2 --
tools/testing/selftests/vfio/lib/libvfio.mk | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/vfio/Makefile b/tools/testing/selftests/vfio/Makefile
index e6e8cb52ab03..2c32c48db509 100644
--- a/tools/testing/selftests/vfio/Makefile
+++ b/tools/testing/selftests/vfio/Makefile
@@ -29,8 +29,6 @@ CFLAGS += $(EXTRA_CFLAGS)

LDFLAGS += -pthread

-LDLIBS += -luuid
-
$(TEST_GEN_PROGS): $(OUTPUT)/%: $(OUTPUT)/%.o $(LIBVFIO_O)
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(LIBVFIO_O) $(LDLIBS) -o $@

diff --git a/tools/testing/selftests/vfio/lib/libvfio.mk b/tools/testing/selftests/vfio/lib/libvfio.mk
index 2b8d73b7d329..67942b085068 100644
--- a/tools/testing/selftests/vfio/lib/libvfio.mk
+++ b/tools/testing/selftests/vfio/lib/libvfio.mk
@@ -26,6 +26,8 @@ $(LIBVFIO_O_DIRS):

CFLAGS += -I$(LIBVFIO_SRCDIR)/include

+LDLIBS += -luuid
+
$(LIBVFIO_O): $(LIBVFIO_OUTPUT)/%.o : $(LIBVFIO_SRCDIR)/%.c | $(LIBVFIO_O_DIRS)
$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@


base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
--
2.55.0.rc0.799.gd6f94ed593-goog