From nobody Tue Sep 9 09:48:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1745925620; cv=none; d=zohomail.com; s=zohoarc; b=iWlfW0qvUFFp+urnKlEJS+lvg0gwfVn9z7Sx6b9hD52LdQjsrjJUNg0V/iNfZRBxjjYbKwJZwDr9qkJA5S6E2BXrUSou6FVFYPmDemwOOpQ1l04cKDzv4iorLeZ2pPCONaaDlV8kENPiMvFVZeryODVfPunVkwTvESDAk45b1Bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745925620; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=l995zugbisfMuI1jk0GXCORubCZEFbKRSi7kL0vl8h4=; b=AMDJAlCSONzMLMFQb3jmsx9sYlPg1ZoVpOaF04Iu8z0fJFcfdmjRA58iYmovHWSqLHRfVjJPhYg0+atonjNIBGS+ZCzC7VKoVNP4HVROXzJWB1mWe5L4TITcknNlAwI3PH25aVMMeIUgSb8a6ww2jVNPPr7lO5DWGTjkImXXzbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1745925620423732.5238687547339; Tue, 29 Apr 2025 04:20:20 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BFE2A11F1; Tue, 29 Apr 2025 07:20:19 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D448D1465; Tue, 29 Apr 2025 07:15:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 31AA6136E; Tue, 29 Apr 2025 07:15:05 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 99E6911F1 for ; Tue, 29 Apr 2025 07:14:41 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-186-a8Z7FW64NMeq6ua3-vrgdQ-1; Tue, 29 Apr 2025 07:14:39 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E18E7195608C for ; Tue, 29 Apr 2025 11:14:38 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.98]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 14D00195608D; Tue, 29 Apr 2025 11:14:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745925281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B3eUfYjb1XL2K7sIIuUii5BotCAmzTjHePeXQYfMbgI=; b=AOm8E+9AYTlETrExAMVfI2zzcTk96FAydn2rJOWTYdEBJGPkyQES0oBHV+mN/2Da1AEsaV 1SYbBJoMI1sstXZ+x8W4re7eiVRL6cwvCya+9S74JnxTOH3T8hF1J/Hn/e71VsFlN9rtvF 5vYAHWswO+1ZbP1nvw/oN3XawY6WVyE= X-MC-Unique: a8Z7FW64NMeq6ua3-vrgdQ-1 X-Mimecast-MFC-AGG-ID: a8Z7FW64NMeq6ua3-vrgdQ_1745925279 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 14/20] util: remove use hardcoded MODPROBE/RMMOD paths Date: Tue, 29 Apr 2025 12:14:14 +0100 Message-ID: <20250429111420.1748521-15-berrange@redhat.com> In-Reply-To: <20250429111420.1748521-1-berrange@redhat.com> References: <20250429111420.1748521-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hqZZ95eALyN9LhZSRUgwtGaGPD-RU3ZeZIJB_4_Vry4_1745925279 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KVEXNI3DPR7LGWADUCEPQO4ORGJIBV6J X-Message-ID-Hash: KVEXNI3DPR7LGWADUCEPQO4ORGJIBV6J X-MailFrom: berrange@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1745925620932019000 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 Allow virCommand to find 'modprobe' & 'rmmod' in $PATH. These commands are only used when running privileged in which case both 'bin' and 'sbin' dirs will be in $PATH, so virFindFileInPath will do the right thing to find them. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- meson.build | 2 -- src/util/virkmod.c | 4 ++-- tests/virkmodtest.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 2a7c264114..3022f0b984 100644 --- a/meson.build +++ b/meson.build @@ -854,9 +854,7 @@ optional_test_programs =3D [ ] =20 optional_programs =3D [ - 'modprobe', 'ovs-vsctl', - 'rmmod', 'tc', ] + optional_test_programs =20 diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 4c709f8659..111627f4b1 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -29,7 +29,7 @@ doModprobe(const char *opts, const char *module, char **o= utbuf, char **errbuf) { g_autoptr(virCommand) cmd =3D NULL; =20 - cmd =3D virCommandNewArgList(MODPROBE, opts, NULL); + cmd =3D virCommandNewArgList("modprobe", opts, NULL); if (module) virCommandAddArg(cmd, module); if (outbuf) @@ -48,7 +48,7 @@ doRmmod(const char *module, char **errbuf) { g_autoptr(virCommand) cmd =3D NULL; =20 - cmd =3D virCommandNewArgList(RMMOD, module, NULL); + cmd =3D virCommandNewArgList("rmmod", module, NULL); virCommandSetErrorBuffer(cmd, errbuf); =20 if (virCommandRun(cmd, NULL) < 0) diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index ec28ef1282..eb9a2aa740 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -63,7 +63,7 @@ testKModLoad(const void *args G_GNUC_UNUSED) return -1; } =20 - if (checkOutput(&buf, MODPROBE " -b " MODNAME "\n") < 0) + if (checkOutput(&buf, "modprobe -b " MODNAME "\n") < 0) return -1; =20 return 0; @@ -85,7 +85,7 @@ testKModUnload(const void *args G_GNUC_UNUSED) return -1; } =20 - if (checkOutput(&buf, RMMOD " " MODNAME "\n") < 0) + if (checkOutput(&buf, "rmmod " MODNAME "\n") < 0) return -1; =20 return 0; --=20 2.49.0