From nobody Sun Feb 8 20:59:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1594894153; cv=none; d=zohomail.com; s=zohoarc; b=F/LEzWxDu7yxhfHHuWoNZdB1Vkd5DTnxZel4Dhr161pzMD60HaxagsjlMOx7Z1S0zoWSCiSy0ZIYbBDpEE9Rr+TkthTDOVUez7sK1MjEIhdYSc5k2MEMwvMgsfIFhm1FDDTXTJ2/j+BF9bTT2oG3Y+VxFxl9+edNaThrqsfBnrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894153; 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=t6wAaMVxOnlL4uC/ZMTD81APiEm3ugFBFXvW98O4KJQ=; b=nXI1FlW4iUu0zbuH02kMMCd38R7I1D/WEauC+uMnk4Xdx4lvWHxRQFR2Cd/XPzqpebP6YKA6MbCy1cKTGwlBMy2dMWOx7PkoNndOsl+xUuf90EPh4iP8M4MGphsHhwqhMoQIFRuocJyQomULGVRgGMuYMHB46mc9u4I/UWgFCiE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894153075745.1057430938513; Thu, 16 Jul 2020 03:09:13 -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-153-4PaSPY3sOcerpSh-DrrbtQ-1; Thu, 16 Jul 2020 06:09:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B1F38027F3; Thu, 16 Jul 2020 10:08:57 +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 3956361465; Thu, 16 Jul 2020 10:08:57 +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 073649A302; Thu, 16 Jul 2020 10:08:57 +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 06GA6Dcp019420 for ; Thu, 16 Jul 2020 06:06:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 72D942DE6D; Thu, 16 Jul 2020 10:06:13 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1A232B6DB for ; Thu, 16 Jul 2020 10:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894152; 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=t6wAaMVxOnlL4uC/ZMTD81APiEm3ugFBFXvW98O4KJQ=; b=PcNFcLImOAz8nN5FIwv0RlFk9goxDBW86lDcgweIFEHJDDltf8RJ08l762Pg+7ancaLJym oXF9Hciu4Aigg/EG8BPmtOtXht8aYaammjhnS9fwC46yg4Y5z23OC0PGOoJP592L/ht5Uu jL2kqtyYUy5mRZU51fezYNCsIa6EfWU= X-MC-Unique: 4PaSPY3sOcerpSh-DrrbtQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 255/351] meson: tools: build virt-host-validate binary Date: Thu, 16 Jul 2020 11:58:11 +0200 Message-Id: <827787dac66b194d2a16295a50099d18c37ef396.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.79 on 10.5.11.16 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 --- tools/Makefile.am | 43 ------------------------------------------- tools/meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 01c24bec02d..d285146622f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -45,10 +45,6 @@ bin_PROGRAMS +=3D virt-login-shell libexec_PROGRAMS =3D virt-login-shell-helper endif WITH_LOGIN_SHELL =20 -if WITH_HOST_VALIDATE -bin_PROGRAMS +=3D virt-host-validate -endif WITH_HOST_VALIDATE - virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ @@ -66,45 +62,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virt_host_validate_SOURCES =3D \ - virt-host-validate.c \ - virt-host-validate-common.c virt-host-validate-common.h - -VIRT_HOST_VALIDATE_QEMU =3D \ - virt-host-validate-qemu.c \ - virt-host-validate-qemu.h -VIRT_HOST_VALIDATE_LXC =3D \ - virt-host-validate-lxc.c \ - virt-host-validate-lxc.h -VIRT_HOST_VALIDATE_BHYVE =3D \ - virt-host-validate-bhyve.c \ - virt-host-validate-bhyve.h -if WITH_QEMU -virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_QEMU) -endif ! WITH_QEMU - -if WITH_LXC -virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_LXC) -endif ! WITH_LXC - -if WITH_BHYVE -virt_host_validate_SOURCES +=3D $(VIRT_HOST_VALIDATE_BHYVE) -endif ! WITH_BHYVE - -virt_host_validate_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) - -virt_host_validate_LDADD =3D \ - ../src/libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - -virt_host_validate_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(NULL) - # virt-login-shell will be setuid, and must not link to anything # except glibc. It wil scrub the environment and then invoke the # real virt-login-shell-helper binary. diff --git a/tools/meson.build b/tools/meson.build index 3a4bd760688..8c7d3ec64ab 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -32,3 +32,45 @@ libvirt_shell_lib =3D static_library( coverage_flags, ], ) + +if conf.has('WITH_HOST_VALIDATE') + virt_host_validate_sources =3D [ + 'virt-host-validate.c', + 'virt-host-validate-common.c', + ] + + if conf.has('WITH_QEMU') + virt_host_validate_sources +=3D [ + 'virt-host-validate-qemu.c', + ] + endif + if conf.has('WITH_LXC') + virt_host_validate_sources +=3D [ + 'virt-host-validate-lxc.c', + ] + endif + if conf.has('WITH_BHYVE') + virt_host_validate_sources +=3D [ + 'virt-host-validate-bhyve.c', + ] + endif + + executable( + 'virt-host-validate', + [ + virt_host_validate_sources, + ], + dependencies: [ + tools_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libdir, + ) +endif --=20 2.26.2