From nobody Sun Feb 8 20:13:14 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=1594893876; cv=none; d=zohomail.com; s=zohoarc; b=GPvE1vcHM5CqcOv/QG9s8tX3TZwajKLVN7phGxZxWduvqZ0ImDe40v17TX1acWy++M9nGhganGTsmqb7gLOR1NJ2bytNo/4vQX/OE5rRpDnmO8KCbv2Q+6uHKSbN3PVjrTtqGaK++hFxpw1XWIbsLKODN+aFRZVAjBuaAwA/msw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893876; 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=SYuj6Wg7xqGPXmJXgYsXaIJ6DARcEcN8aDLiWzTXb18=; b=lHRoXgVciakmiG7riftCnhEhdjQhAbUn9LLD+iKbV2GbnAMBQbIBI9ILcW5/tjbYlRIag/d+q434Ko0hMRKqkprtc6Kwgwd2Wsbp+fc9jmJg/wBsmHshuxYFygi8oC9GvGyx0lo6Zr96OQCIerA9ooWfOS33wt919evQyHJTDK0= 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 1594893876706395.84658542385057; Thu, 16 Jul 2020 03:04:36 -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-58-yLaEnIL0Noe88k4yRK_PZg-1; Thu, 16 Jul 2020 06:03:12 -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 A327A1888ACF; Thu, 16 Jul 2020 10:02:44 +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 5E4166FEFB; Thu, 16 Jul 2020 10:02:44 +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 25C591809557; Thu, 16 Jul 2020 10:02:44 +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 06GA2eOb016592 for ; Thu, 16 Jul 2020 06:02:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id A98472B6E2; Thu, 16 Jul 2020 10:02:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 235B22B6DB for ; Thu, 16 Jul 2020 10:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893875; 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=SYuj6Wg7xqGPXmJXgYsXaIJ6DARcEcN8aDLiWzTXb18=; b=AncEV+VgXBA6yO7VwtDzWpiJsZv0rnblEsD2J8bLKpqzBZ+oqBO97FG/jl3Np1bP5rFPij iia3ebt+4yGrP7lKjNO8F3meVaDf3YN6QfQrNHKGyCfJ82yVYUQKDMb/lT1IRV7AuPMnkI CJJgRvcT4BsJhILoOpJL1sGZHun2+hs= X-MC-Unique: yLaEnIL0Noe88k4yRK_PZg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 081/351] meson: add libvirtd driver build option Date: Thu, 16 Jul 2020 11:55:17 +0200 Message-Id: <522b4b572c3c2f83bfd156219348f5814cb36a3a.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.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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 | 13 ------------- m4/virt-driver-libvirtd.m4 | 33 --------------------------------- meson.build | 23 +++++++++++++++++++++++ meson_options.txt | 1 + 4 files changed, 24 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-driver-libvirtd.m4 diff --git a/configure.ac b/configure.ac index e9a684b1b58..25250fd2c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -87,16 +87,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" =3D "ye= s"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" =3D "yes"]) AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" =3D "yes"]) =20 -if test "$with_win" =3D "yes" ; then - # We don't support the daemon yet - with_libvirtd=3Dno -fi - -# The daemon requires remote support. Likewise, if we are not using -# RPC, we don't need several libraries. -if test "$with_remote" =3D "no" ; then - with_libvirtd=3Dno -fi # Stateful drivers are useful only when building the daemon. if test "$with_libvirtd" =3D "no" ; then with_qemu=3Dno @@ -130,7 +120,6 @@ LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST -LIBVIRT_DRIVER_ARG_LIBVIRTD LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 @@ -145,7 +134,6 @@ LIBVIRT_DRIVER_CHECK_BHYVE LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST -LIBVIRT_DRIVER_CHECK_LIBVIRTD LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE =20 @@ -353,7 +341,6 @@ LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK -LIBVIRT_DRIVER_RESULT_LIBVIRTD LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) diff --git a/m4/virt-driver-libvirtd.m4 b/m4/virt-driver-libvirtd.m4 deleted file mode 100644 index 090f9532f94..00000000000 --- a/m4/virt-driver-libvirtd.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The libvirtd driver -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_DRIVER_ARG_LIBVIRTD], [ - LIBVIRT_ARG_WITH_FEATURE([LIBVIRTD], [libvirtd], [yes]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBVIRTD], [ - if test "$with_libvirtd" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_LIBVIRTD], 1, [whether libvirtd daemon is ena= bled]) - fi - AM_CONDITIONAL([WITH_LIBVIRTD], [test "$with_libvirtd" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_LIBVIRTD], [ - LIBVIRT_RESULT([Libvirtd], [$with_libvirtd]) -]) diff --git a/meson.build b/meson.build index 6c31ae6c848..4aae01f62e5 100644 --- a/meson.build +++ b/meson.build @@ -1549,6 +1549,28 @@ endif remote_default_mode =3D get_option('remote_default_mode').to_upper() conf.set('REMOTE_DRIVER_MODE_DEFAULT', 'REMOTE_DRIVER_MODE_@0@'.format(rem= ote_default_mode)) =20 +if not get_option('driver_libvirtd').disabled() + use_libvirtd =3D true + + if host_machine.system() =3D=3D 'windows' + use_libvirtd =3D false + if get_option('driver_libvirtd').enabled() + error('libvirtd daemon is not supported on windows') + endif + endif + + if not conf.has('WITH_REMOTE') + use_libvirtd =3D false + if get_option('driver_libvirtd').enabled() + error('remote driver is required for libvirtd daemon') + endif + endif + + if use_libvirtd + conf.set('WITH_LIBVIRTD', 1) + endif +endif + =20 # define top include directory =20 @@ -1570,6 +1592,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) =20 driver_summary =3D { 'Remote': conf.has('WITH_REMOTE'), + 'Libvirtd': conf.has('WITH_LIBVIRTD'), } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 4360540bf5a..8731f78defe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,5 +47,6 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') =20 =20 # build driver options +option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_remote', type: 'feature', value: 'enabled', description: 'r= emote driver') option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct']= , value: 'legacy', description: 'remote driver default mode') --=20 2.26.2