From patchwork Fri Mar 14 01:16:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nathan X-Patchwork-Id: 40153 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C3C327BBEA; Fri, 14 Mar 2025 01:17:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 915F327BBE2 for ; Fri, 14 Mar 2025 01:17:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tstfs-00074r-JN; Thu, 13 Mar 2025 21:17:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tstfb-000736-Iv for guix-patches@gnu.org; Thu, 13 Mar 2025 21:17:12 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tstfa-0004lc-TE for guix-patches@gnu.org; Thu, 13 Mar 2025 21:17:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:Subject; bh=CyvRVsQdN0yWGSJuZHhkHFohFKVfiCw2kx/A9KJYqvU=; b=FTZCwnBEkAsR4veipYqQvZdWBl207V8NoEVOchVTvWfMXp1l/Pw2IFeEvBmRYOkcwWTdQRg51lA27s4daW7coKhYdyyvRoCVHfEqpjY/Ho5DbMh1XQqSHaa0R49DQsCc8DB4sboa4b1+y/3oNzGvjPDEsgLVTLBGAfC5S3903evnhgOdzlCfofSX/VIlHQaChpcDyEYOQEZ6BHTdYP8iioV+AnyS5dk0Z2ecjV2vGHyp20+F2HfrpI7q2YDduJZDx7CPqdK8YyDWkoZrlgTj9sGUhU187HlGBcKTMiTojuX6fWQGgcXoG8LbDzGnnFY+fxQfvMUikCaSdbDjIQ3OTA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tstfa-0003jD-Ns for guix-patches@gnu.org; Thu, 13 Mar 2025 21:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77004] [PATCH] gnu: libvirt: Fix path to Linux modules Resent-From: nathan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 14 Mar 2025 01:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77004@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174191500714286 (code B ref -1); Fri, 14 Mar 2025 01:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Mar 2025 01:16:47 +0000 Received: from localhost ([127.0.0.1]:59071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tstfK-0003iE-4Q for submit@debbugs.gnu.org; Thu, 13 Mar 2025 21:16:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40084) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tstfH-0003hq-Qk for submit@debbugs.gnu.org; Thu, 13 Mar 2025 21:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tstfC-00070c-2e for guix-patches@gnu.org; Thu, 13 Mar 2025 21:16:38 -0400 Received: from mail.nborghese.com ([2001:19f0:5:48e0:5400:4ff:fe08:e8a8]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tstf9-0004ik-LR for guix-patches@gnu.org; Thu, 13 Mar 2025 21:16:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=062122; bh=CyvRVsQdN0yWG SJuZHhkHFohFKVfiCw2kx/A9KJYqvU=; h=subject:from:to:date; d=nborghese.com; b=KU/owCgHJnbDibcx8XVB9wnZe7OzYjMfMjKZE3t5Rlvg6wUQu/W fS+CzdlJ9vCUa8EC38J3AV9Qm6lH/19wz4f/iBHs4ZIgS519Y6x73dCyH+uDyS5KZK1HyS v6MTCy0UTjDc4cEsJ7ognU0tuqXSyWTPcKmuFXu+sSwV25hM9U= Received: by nborghese.com (OpenSMTPD) with ESMTPSA id ef331a01 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 14 Mar 2025 01:16:21 +0000 (UTC) Message-ID: <42db80d1-c502-4526-a685-b905ba957201@nborghese.com> Date: Fri, 14 Mar 2025 01:16:30 +0000 MIME-Version: 1.0 User-Agent: Icedove Daily Content-Language: en-US Received-SPF: pass client-ip=2001:19f0:5:48e0:5400:4ff:fe08:e8a8; envelope-from=nathan_mail@nborghese.com; helo=mail.nborghese.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: nathan X-ACL-Warn: , nathan via Guix-patches X-Patchwork-Original-From: nathan via Guix-patches via From: nathan Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches libvirt needs to load a file that is inside the modules folder. Fix the path Nix has a similar fix https://github.com/NixOS/nixpkgs/pull/286985 From f3317c91eb469ff54e31b0fafd45e2070a1bb06a Mon Sep 17 00:00:00 2001 Message-ID: From: nathan Date: Thu, 13 Mar 2025 20:36:27 -0400 Subject: [PATCH] gnu: libvirt: Fix path to Linux modules * gnu/packages/virtualization.scm (libvirt): Use LINUX_MODULE_DIRECTORY to find modules. [source]: Add libvirt-respect-modules-path.patch * gnu/packages/patches/libvirt-respect-modules-path.patch: new file * gnu/local.mk: Register new file * gnu/services/virtualization.scm (libvirt-shepherd-service) <#:environment-variables>: pass LINUX_MODULE_DIRECTORY Change-Id: Idde5b59df3c1641fcbab376e6c694730769294d3 --- gnu/local.mk | 1 + .../patches/libvirt-respect-modules-path.patch | 12 ++++++++++++ gnu/packages/virtualization.scm | 3 ++- gnu/services/virtualization.scm | 10 ++++++---- 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/libvirt-respect-modules-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 149ef8dff9..e1a34901fd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1673,6 +1673,7 @@ dist_patch_DATA = \ %D%/packages/patches/librewolf-neuter-locale-download.patch \ %D%/packages/patches/librewolf-use-system-wide-dir.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ + %D%/packages/patches/libvirt-respect-modules-path.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/lightdm-arguments-ordering.patch \ %D%/packages/patches/lightdm-vnc-ipv6.patch \ diff --git a/gnu/packages/patches/libvirt-respect-modules-path.patch b/gnu/packages/patches/libvirt-respect-modules-path.patch new file mode 100644 index 0000000000..c1ccc8952c --- /dev/null +++ b/gnu/packages/patches/libvirt-respect-modules-path.patch @@ -0,0 +1,12 @@ +use linux module path environment variable from modprobe if available +--- a/src/util/virpci.c ++++ b/src/util/virpci.c +@@ -1459,6 +1459,7 @@ virPCIDeviceFindBestVFIOVariant(virPCIDevice *dev, + } + + uname(&unameInfo); +- modulesAliasPath = g_strdup_printf("/lib/modules/%s/modules.alias", unameInfo.release); ++ char* modulepath=getenv("LINUX_MODULE_DIRECTORY"); ++ modulesAliasPath = g_strdup_printf("%s/%s/modules.alias", modulepath ? modulepath : "/lib/modules", unameInfo.release); + if (virFileReadAll(modulesAliasPath, 8 * 1024 * 1024, &modulesAliasContent) < 0) + return -1; diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87a9aedd3f..a0009f233b 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1549,7 +1549,8 @@ (define-public libvirt version ".tar.xz")) (sha256 (base32 "15jpfrn3d2zyhbm5ip7bmpjb6ch2bfxm1h6yfgh0l3bw3g9ppgg1")) - (patches (search-patches "libvirt-add-install-prefix.patch")))) + (patches (search-patches "libvirt-add-install-prefix.patch" + "libvirt-respect-modules-path.patch")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 796b9bf86f..9b31236732 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -508,11 +508,13 @@ (define (libvirt-shepherd-service config) (list (string-append #$libvirt "/sbin/libvirtd") "-f" #$config-file #$@(if listen-tcp? '("--listen") '())) - ;; For finding qemu and ip binaries. + ;; For finding qemu, ip binaries, and kernel modules #:environment-variables - (list (string-append - "PATH=/run/current-system/profile/bin:" - "/run/current-system/profile/sbin")))) + (list + (string-append + "PATH=/run/current-system/profile/bin:" + "/run/current-system/profile/sbin") + "LINUX_MODULE_DIRECTORY=/run/booted-system/kernel/lib/modules"))) (stop #~(make-kill-destructor)))))) (define libvirt-service-type base-commit: 678b3dddfe442e643fe5cff7730d4f9690c3e2c2 -- 2.48.1