From nobody Mon Feb 9 01:31:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594893994; cv=none; d=zohomail.com; s=zohoarc; b=IEKvvnrlAb+9VDsuLblfgrFkNm9QeaW35wYmsTwUwuIHi3SzBXAMiGbARJKkYVeIy509gDYySZNAWjFb29f2AkIs0qIAPwPz1LVRtSaZoFULLW/IsQvti4lXYMqkLgRDwtVC1inviEyiRcKeNXy8lbxxV+8dXGn0dKDgoy7u3e4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893994; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=C7W4cxxAsNpbtpBpUn3cVUSPXNIGd4sSHzOJmiyBPOg=; b=B93VKWx87XlDZQuzIpwaOpadlC0i9l8/XhuW5JBzX31qoOAYDEZjNZMctKrjsnIDhk5ACnllaRfmC8elYLQn6ruEAadK1On4OgtbMt4zYdesM3i4LMvgULa58nKCp3wuAFFD3qKEDDcXfEc4kdYcl9NjJDZ6ZtRSgb1mafoENPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1594893994224528.1143352931791; Thu, 16 Jul 2020 03:06:34 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-zBOqh11HMYiRjSWSvXI8sw-1; Thu, 16 Jul 2020 06:03:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87019855C58; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65111610AF; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 366919625D; Thu, 16 Jul 2020 10:03:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA3NjI017161 for ; Thu, 16 Jul 2020 06:03:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 620A42B6DB; Thu, 16 Jul 2020 10:03:23 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF7642B6E2 for ; Thu, 16 Jul 2020 10:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893993; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=C7W4cxxAsNpbtpBpUn3cVUSPXNIGd4sSHzOJmiyBPOg=; b=Z7rk/G42e9mBDjmByNzBqOZz+TYmEgcE4pKD1iyv34daNI/ATESMshWlAumLSqVimGq5Ag 6qDoupcQ5SPLQjZ47ZY/vAlhmnjOW/N5VQ2+ampkJdEmBwCIX7c6gmgVQIrK0Zvpde48Ye FG89Ox6nUSjeKS9lmUTEkyAq/vbEjZg= X-MC-Unique: zBOqh11HMYiRjSWSvXI8sw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 121/351] meson: add numad build option Date: Thu, 16 Jul 2020 11:55:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- configure.ac | 3 --- m4/virt-numad.m4 | 58 ----------------------------------------------- meson.build | 11 +++++++++ meson_options.txt | 1 + 4 files changed, 12 insertions(+), 61 deletions(-) delete mode 100644 m4/virt-numad.m4 diff --git a/configure.ac b/configure.ac index b1faa47f81c..82c166b760d 100644 --- a/configure.ac +++ b/configure.ac @@ -96,12 +96,10 @@ dnl dnl Miscellaneous checks dnl =20 -LIBVIRT_ARG_NUMAD LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 =20 -LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG =20 @@ -170,6 +168,5 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-numad.m4 b/m4/virt-numad.m4 deleted file mode 100644 index 378eba3c97d..00000000000 --- a/m4/virt-numad.m4 +++ /dev/null @@ -1,58 +0,0 @@ -dnl The numad binary check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl . -dnl - -AC_DEFUN([LIBVIRT_ARG_NUMAD], [ - LIBVIRT_ARG_WITH([NUMAD], [use numad to manage CPU placement dynamically= ], - [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NUMAD], [ - AC_REQUIRE([LIBVIRT_CHECK_NUMACTL]) - - if test "$with_numad" !=3D "no" ; then - fail=3D0 - - AC_PATH_PROG([NUMAD], [numad], [], [$LIBVIRT_SBIN_PATH]) - - if test "$with_numad" =3D "check"; then - test "$with_numactl" =3D "yes" || fail=3D1 - if test -z "$NUMAD" || test $fail =3D 1; then - with_numad=3D"no" - else - with_numad=3D"yes" - fi - else - test -z "$NUMAD" && - AC_MSG_ERROR([You must install numad package to manage CPU and mem= ory placement dynamically]) - - test "$with_numactl" =3D "yes" || fail=3D1 - test $fail =3D 1 && - AC_MSG_ERROR([You must install the numactl development package in = order to compile and run libvirt]) - fi - fi - if test "$with_numad" =3D "yes"; then - AC_DEFINE_UNQUOTED([HAVE_NUMAD], 1, [whether numad is available]) - AC_DEFINE_UNQUOTED([NUMAD],["$NUMAD"], [Location or name of the numad = program]) - fi - AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" !=3D "no"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NUMAD], [ - LIBVIRT_RESULT([numad], [$with_numad]) -]) diff --git a/meson.build b/meson.build index b1bbd0f4351..f09538bdf13 100644 --- a/meson.build +++ b/meson.build @@ -2146,6 +2146,16 @@ 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('HAVE_NUMAD', 1) + conf.set_quoted('NUMAD', numad_prog.path()) + endif +elif get_option('numad').enabled() + error('You must have numactl enabled for numad support.') +endif + =20 # define top include directory =20 @@ -2272,6 +2282,7 @@ misc_summary =3D { 'Use -Werror': cc_flags.contains('-Werror'), 'Warning Flags': supported_cc_flags, 'DTrace': conf.has('WITH_DTRACE_PROBES'), + 'numad': conf.has('HAVE_NUMAD'), 'Init script': init_script, 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), diff --git a/meson_options.txt b/meson_options.txt index b7a4fddb8a2..16acb4f3c50 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -98,3 +98,4 @@ option('host_validate', type: 'feature', value: 'auto', d= escription: 'build virt option('init_script', type: 'combo', choices: ['systemd', 'openrc', 'check= ', 'none'], value: 'check', description: 'Style of init script to install') option('login_shell', type: 'feature', value: 'auto', description: 'build = virt-login-shell') option('nss', type: 'feature', value: 'auto', description: 'enable Name Se= rvice Switch plugin for resolving guest IP addresses') +option('numad', type: 'feature', value: 'auto', description: 'use numad to= manage CPU placement dynamically') --=20 2.26.2