From nobody Sun Feb 8 12:42:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1594893882; cv=none; d=zohomail.com; s=zohoarc; b=iktZOLLC1v4ui6P/aqqRT4C37OsFbh2PuidGIbgBNLk5wLng+0YvAeSaWX+AUC7s8C1hkFL9EnuEjAkIQgjndMVKexvbcMUA0QkFvdw/Rkk0829qH7g2oDHItI/XYtULWpH155lHyFxXmUvPgZqZQMgnyOi2dIjLis6VWOY2rvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893882; 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=kolGCK//skPtL0TZM5SgquExKDpZExAWKwJNY5/7u6o=; b=akWlL9ATP/RNuOOLYnkxT2n/ORHBWAfDwm3Rc0Efz+thcgQvq9dHGA6O889MynNfoJq8M0dprvbN5nFfigSvsNAdGKlep+rhXufgHBBCp0jTDXf4zcH+1gmQgDHogRE3owyZZbRJ7ZA8epquE4dy9aXU+ubGi1cxTjV8zEtL+3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594893882704314.8738256990248; Thu, 16 Jul 2020 03:04:42 -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-228-LJ7GF9DDPW60U9eEInAmzg-1; Thu, 16 Jul 2020 06:03:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4ABA280183C; Thu, 16 Jul 2020 10:03:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2511F2B6E6; Thu, 16 Jul 2020 10:03:22 +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 E3E991804759; Thu, 16 Jul 2020 10:03:21 +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 06GA3JfB017110 for ; Thu, 16 Jul 2020 06:03:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA2DA2B6E2; Thu, 16 Jul 2020 10:03:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 353202B6DB for ; Thu, 16 Jul 2020 10:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893881; 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=kolGCK//skPtL0TZM5SgquExKDpZExAWKwJNY5/7u6o=; b=hGxAwaaG508Oy4LZmnhGeC9t1mU399zmAJGCsda5RVx9aVVUJfJetHos6L4ZBGjJpsrIKk eDAj+deE22o4O+bnQIXeYMxZQHQwBtzTDX7E9DsUBmREoJZ8IpU3PE1kPf8QkTt/tIugCG kCbG4bwtGiraXwQAahf2Tpg2a+rF/0s= X-MC-Unique: LJ7GF9DDPW60U9eEInAmzg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 117/351] meson: add host_validate build option Date: Thu, 16 Jul 2020 11:55:53 +0200 Message-Id: <30be4d387fdf56c8af179bf0299e6598c644f579.1594891445.git.phrdina@redhat.com> 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.84 on 10.5.11.23 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-host-validate.m4 | 43 ---------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-host-validate.m4 diff --git a/configure.ac b/configure.ac index 2f486df2e23..eaa7b57380e 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,6 @@ dnl LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL -LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG =20 @@ -108,7 +107,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL -LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -182,6 +180,5 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL -LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-host-validate.m4 b/m4/virt-host-validate.m4 deleted file mode 100644 index e43cec53665..00000000000 --- a/m4/virt-host-validate.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (C) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. -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 . - -AC_DEFUN([LIBVIRT_ARG_HOST_VALIDATE], [ - LIBVIRT_ARG_WITH([HOST_VALIDATE], [build virt-host-validate], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [ - if test "x$with_host_validate" !=3D "xno"; then - if test "x$with_win" =3D "xyes"; then - if test "x$with_host_validate" =3D "xyes"; then - AC_MSG_ERROR([virt-host-validate is not supported on Windows]) - else - with_host_validate=3Dno; - fi - else - with_host_validate=3Dyes; - fi - fi - - if test "x$with_host_validate" =3D "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_HOST_VALIDATE], 1, [whether virt-host-valid= ate is built]) - fi - AM_CONDITIONAL([WITH_HOST_VALIDATE], [test "x$with_host_validate" =3D "x= yes"]) -]) - -AC_DEFUN([LIBVIRT_RESULT_HOST_VALIDATE], [ - LIBVIRT_RESULT([virt-host-validate], [$with_host_validate]) -]) diff --git a/meson.build b/meson.build index c7c5cdd3b40..ece7c90e26d 100644 --- a/meson.build +++ b/meson.build @@ -2080,6 +2080,12 @@ if host_machine.system() =3D=3D 'linux' endif endif =20 +if not get_option('host_validate').disabled() and host_machine.system() != =3D 'windows' + conf.set('WITH_HOST_VALIDATE', 1) +elif get_option('host_validate').enabled() + error('virt-host-validate is not supported on Windows') +endif + =20 # define top include directory =20 @@ -2207,6 +2213,7 @@ misc_summary =3D { 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), + 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') =20 diff --git a/meson_options.txt b/meson_options.txt index b12d0aa3d7b..80a11df4679 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -94,3 +94,4 @@ option('chrdev_lock_files', type: 'string', value: '', de= scription: 'location fo option('debug_logs', type: 'boolean', value: true, description: 'enable de= bugging output') option('default_editor', type: 'string', value: 'vi', description: 'Editor= to use for interactive commands') option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace = for static probing') +option('host_validate', type: 'feature', value: 'auto', description: 'buil= d virt-host-validate') --=20 2.26.2