From nobody Sun Feb 8 11:16:32 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=1594893792; cv=none; d=zohomail.com; s=zohoarc; b=XATITgDsfmbp6RuZsinkXYnU8KUH/gJcUYZyh/mvnfEjhItveWQRY2wC2I8jh0rk2epkk9roRdNqwqGXkRYd43NegMYbFkF1wzjznm1GVLKrEhshZeyQ7CJ6qG/sAL6TP5m5rxEsmtJcBq2DdKUt+FHfQGrqg9IVByRyW2bS4nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594893792; 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=M5A2auqgAqPXaoJyuKxZjhztlFuJE84CIO2W5/UiS18=; b=S6c560dUQeKaMrWQN0I6MWE0zBHkUh5Dw15GQ4QaTK5uvYv/r8xHTRSXvURRHGb1tsIctY6mncn5Y+BTFdMigS0eKixsmezuc7F+YUMIqG9bwgowwnw/bOCPtaJX5j9uDfKzblRwfjqqktbjWq8NDel/tVTJXDtvNlCKOau67pQ= 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 1594893792313295.9476073842616; Thu, 16 Jul 2020 03:03:12 -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-457-5TWkT8kTMziGBPVHb8eZrA-1; Thu, 16 Jul 2020 06:03:07 -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 47238100A63E; Thu, 16 Jul 2020 10:02:59 +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 D61ED70101; Thu, 16 Jul 2020 10:02:58 +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 A123896236; Thu, 16 Jul 2020 10:02:58 +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 06GA2rqt016773 for ; Thu, 16 Jul 2020 06:02:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 642792DE9C; Thu, 16 Jul 2020 10:02:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1CBB2DE7F for ; Thu, 16 Jul 2020 10:02:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594893791; 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=M5A2auqgAqPXaoJyuKxZjhztlFuJE84CIO2W5/UiS18=; b=A1n63pzRlcVAUXjsMzkXiRevWKdBEgBS+xk+bBsLEBlHSV71CkOfZyJvM/LnY4KKpuH442 /NLCiZtg+3ATPqYVmRGfaSVpIZLp+6DCu9urUl+CR97vKVf8ebu/6yRpkW0wC3A0cezm1O /Ty5mkLrRwCRKIqt28/i1r/81hGsrrA= X-MC-Unique: 5TWkT8kTMziGBPVHb8eZrA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 095/351] meson: add interface driver build option Date: Thu, 16 Jul 2020 11:55:31 +0200 Message-Id: <6f396a382ee9a94acd21171cc6fb0e7e2f4e1a1f.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 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 | 14 ----------- m4/virt-driver-interface.m4 | 49 ------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 m4/virt-driver-interface.m4 diff --git a/configure.ac b/configure.ac index 2100beb582d..9a806517594 100644 --- a/configure.ac +++ b/configure.ac @@ -92,16 +92,6 @@ LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS =20 =20 - -dnl -dnl Virtualization drivers check -dnl - -LIBVIRT_DRIVER_ARG_INTERFACE - -LIBVIRT_DRIVER_CHECK_INTERFACE - - dnl dnl in case someone want to build static binaries dnl STATIC_BINARIES=3D"-static" @@ -283,10 +273,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Configuration summary]) AC_MSG_NOTICE([=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Drivers]) -AC_MSG_NOTICE([]) -LIBVIRT_DRIVER_RESULT_INTERFACE -AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) LIBVIRT_STORAGE_RESULT_DIR diff --git a/m4/virt-driver-interface.m4 b/m4/virt-driver-interface.m4 deleted file mode 100644 index 68a0219502a..00000000000 --- a/m4/virt-driver-interface.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl The interface 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_INTERFACE], [ - LIBVIRT_ARG_WITH_FEATURE([INTERFACE], [host interface driver], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_INTERFACE], [ - AC_REQUIRE([LIBVIRT_DRIVER_CHECK_LIBVIRTD]) - AC_REQUIRE([LIBVIRT_CHECK_NETCF]) - AC_REQUIRE([LIBVIRT_CHECK_UDEV]) - - dnl Don't compile the interface driver without libvirtd - if test "$with_libvirtd" =3D "no" ; then - with_interface=3Dno - fi - - dnl The interface driver depends on the netcf library or udev library - case $with_interface:$with_netcf:$with_udev in - check:*yes*) with_interface=3Dyes ;; - check:no:no) with_interface=3Dno ;; - yes:no:no) AC_MSG_ERROR([Requested the Interface driver without netcf = or udev support]) ;; - esac - - if test "$with_interface" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], [whether the interface drive= r is enabled]) - fi - AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_INTERFACE], [ - LIBVIRT_RESULT([Interface], [$with_interface]) -]) diff --git a/meson.build b/meson.build index bbc74e32dd5..b25d07fce94 100644 --- a/meson.build +++ b/meson.build @@ -1599,6 +1599,12 @@ elif get_option('driver_hyperv').enabled() error('openwsman is required for the Hyper-V driver') endif =20 +if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIR= TD') and (udev_dep.found() or netcf_dep.found()) + conf.set('WITH_INTERFACE', 1) +elif get_option('driver_interface').enabled() + error('Requested the Interface driver without netcf or udev and libvirtd= support') +endif + if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') libxl_version =3D '4.6.0' libxl_dep =3D dependency('xenlight', version: '>=3D' + libxl_version, re= quired: get_option('driver_libxl')) @@ -1880,6 +1886,7 @@ driver_summary =3D { 'Remote': conf.has('WITH_REMOTE'), 'Network': conf.has('WITH_NETWORK'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), + 'Interface': conf.has('WITH_INTERFACE'), } summary(driver_summary, section: 'Drivers', bool_yn: true) =20 diff --git a/meson_options.txt b/meson_options.txt index 045c211ca46..3d7272348af 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -50,6 +50,7 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') option('driver_bhyve', type: 'feature', value: 'auto', description: 'BHyVe= driver') option('driver_esx', type: 'feature', value: 'enabled', description: 'esx = driver') option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hype= r-V driver') +option('driver_interface', type: 'feature', value: 'auto', description: 'h= ost interface driver') option('driver_libvirtd', type: 'feature', value: 'auto', description: 'li= bvirtd driver') option('driver_libxl', type: 'feature', value: 'auto', description: 'libxe= nlight driver') option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux C= ontainer driver') --=20 2.26.2