From nobody Tue Sep 9 09:45:38 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=1745925375; cv=none; d=zohomail.com; s=zohoarc; b=iKJf24lVfW4spzttS5NI7quzhb2WDW97x9SM9nyyrUqoKXaERWr0JQ61glwzBl0aDxGQyCsCcTpWDS089FpvnObWedqgO54ivjtvxq/ISqu2KgZkxgXvYEZVVPamxh0S8KUV/UDxLCb4yTtPwClcGqvwVVftQlfWgMRb8WEFvkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745925375; 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=ofkrJ+rJxutJ1h8SnwH5g5ayhfR30PeDKMh9dhlDT5g=; b=VRwDrYWKCVHEhIlJSoZihyrm76qCOG0Qb3fNcAnBmLO9dMnWouH3K7tRFQGkZ6V3dnPL4HAuFEyfWJgoIEbj0nVhAPRR3BiyPNFLz7OS0LwC0CHWrEtUZx1bmjWBT3fh7v7WM44w4YfO8byDYYOhhDeZWVmKrnunrL5/bXiJAok= 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 174592537568921.56155100175772; Tue, 29 Apr 2025 04:16:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BE4E913C9; Tue, 29 Apr 2025 07:16:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 03C16130D; Tue, 29 Apr 2025 07:14:37 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D119111C8; Tue, 29 Apr 2025 07:14:28 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 6CF2F11C8 for ; Tue, 29 Apr 2025 07:14:28 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-31-9lSlHxZyPWKtH4AqTqUADQ-1; Tue, 29 Apr 2025 07:14:26 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1D622180087A for ; Tue, 29 Apr 2025 11:14:26 +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 49559195608D; Tue, 29 Apr 2025 11:14:25 +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=1745925268; 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=WxzjIuUqFbaFGofLPekNkGx2999S+ma38zuxdZOX/C4=; b=Idc0xbbYFDJyonB8gsmfTfbrZOvU3aTUjJHE6tLFkL/2+KBT7C61tzxfhtrZaRPlySVavi OMemUaOOvg3G5c6RhC76mlC+g9yr3H2ovZHBoZMCYZbOq7DtzvQbmlAoHVswZgnQUciufF RWChDrt65KKKVPRmGPm11YMUmld+4sA= X-MC-Unique: 9lSlHxZyPWKtH4AqTqUADQ-1 X-Mimecast-MFC-AGG-ID: 9lSlHxZyPWKtH4AqTqUADQ_1745925266 To: devel@lists.libvirt.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 03/20] util: stop hardcoding numad path Date: Tue, 29 Apr 2025 12:14:03 +0100 Message-ID: <20250429111420.1748521-4-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: Uyi7LX_-3PZU6cLEQdKg2IzaX0Kymc0NT_X-IodovwM_1745925266 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CTUJUZK5IRD4N6BBNJZLHMIRLCS7NXM4 X-Message-ID-Hash: CTUJUZK5IRD4N6BBNJZLHMIRLCS7NXM4 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: 1745925377609019100 Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 Change the meson rules to always enable numad if on a Linux host, unless the meson options say not to. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Krempa --- meson.build | 10 +++------- src/util/virnuma.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 14c98b49a1..767205f44b 100644 --- a/meson.build +++ b/meson.build @@ -2028,14 +2028,10 @@ if not get_option('nss').disabled() endif endif =20 -if not get_option('numad').disabled() and numactl_dep.found() - numad_prog =3D find_program('numad', required: get_option('numad'), dirs= : libvirt_sbin_path) - if numad_prog.found() - conf.set('WITH_NUMAD', 1) - conf.set_quoted('NUMAD', numad_prog.full_path()) - endif +if not get_option('numad').disabled() and numactl_dep.found() and host_mac= hine.system() =3D=3D 'linux' + conf.set('WITH_NUMAD', 1) elif get_option('numad').enabled() - error('You must have numactl enabled for numad support.') + error('You must have a Linux host with numactl enabled for numad support= .') endif =20 # nwfilter should only be compiled for linux, and only if the diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 9393c20875..67c51630c7 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -61,7 +61,7 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus, g_autoptr(virCommand) cmd =3D NULL; char *output =3D NULL; =20 - cmd =3D virCommandNewArgList(NUMAD, "-w", NULL); + cmd =3D virCommandNewArgList("numad", "-w", NULL); virCommandAddArgFormat(cmd, "%d:%llu", vcpus, VIR_DIV_UP(balloon, 1024)); =20 --=20 2.49.0