From nobody Sun Feb 8 21:48:39 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=1594894701; cv=none; d=zohomail.com; s=zohoarc; b=WP9K9p84J8QJlVx10Iw8tFkMmYyiX2OlAwirq1e4FnsImp/SM5mHH9OvzWBVW2q1DpH/ayDBR/bZPXrrKvK72msioQ5TjcGmHtuD2tr4V2iCcT0ftNMcl7CoaRvwPrtkh60qIKMZDBfVyRMJ7cjRMspPTmgpubS+T8Tr4e/A3aI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894701; 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=1055yqCF3wnFrHKu+kDAG70IxFUuth8E9pczGf6q5Yw=; b=L+MCeyWSthCSKHc+uZ0u5zSKLjPkgt98+mV6Vn39zQ6VyrOMSdfZthLjSo1ocVOvqiifeaXCm55bR4A/wc/jmcN3XRHlqR5nkQcMECdY0g2TqJuP0TiGRJEUhNxcFxHw+Ws0nCfx0zGfnTQY43xS0Ya4qEaR/jyBitxd0+Sv+ZY= 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 1594894701368192.7272403641009; Thu, 16 Jul 2020 03:18:21 -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-491-1pJDfLULPcShE0t3Z82QEg-1; Thu, 16 Jul 2020 06:03:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 458CB800491; Thu, 16 Jul 2020 10:02:42 +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 0D8E910098A1; Thu, 16 Jul 2020 10:02:42 +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 C571D9623D; Thu, 16 Jul 2020 10:02:41 +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 06GA2dh8016570 for ; Thu, 16 Jul 2020 06:02:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id BFC812B6E2; Thu, 16 Jul 2020 10:02:39 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A7042B6DB 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=1594894700; 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=1055yqCF3wnFrHKu+kDAG70IxFUuth8E9pczGf6q5Yw=; b=PD1EGJh3b9801aRY6ROUJAqOKAeOfqKCMtyn+GORzwGunNJxEpza9/zQWYO/rIAwxGtyT3 dNtjv4HhWO/78VDiKsAJfJrCZEJsPnzxC3BL5pBbezDoONYpm1rurFYMRQNbww7uKBYCoj juQLf3YMVnrAo0tD42oNVX1GD2YdiGI= X-MC-Unique: 1pJDfLULPcShE0t3Z82QEg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 080/351] meson: add driver_remote build option Date: Thu, 16 Jul 2020 11:55:16 +0200 Message-Id: <68915fbd8f6a7019c244986e19e0946e21a2f878.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.22 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-driver-remote.m4 | 48 ---------------------------------------- meson.build | 18 +++++++++++++++ meson_options.txt | 5 +++++ 4 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 m4/virt-driver-remote.m4 diff --git a/configure.ac b/configure.ac index 7c872bbfe6c..e9a684b1b58 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,6 @@ LIBVIRT_DRIVER_ARG_BHYVE LIBVIRT_DRIVER_ARG_ESX LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST -LIBVIRT_DRIVER_ARG_REMOTE LIBVIRT_DRIVER_ARG_LIBVIRTD LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE @@ -146,7 +145,6 @@ LIBVIRT_DRIVER_CHECK_BHYVE LIBVIRT_DRIVER_CHECK_ESX LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST -LIBVIRT_DRIVER_CHECK_REMOTE LIBVIRT_DRIVER_CHECK_LIBVIRTD LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -354,7 +352,6 @@ LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_TEST -LIBVIRT_DRIVER_RESULT_REMOTE LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_LIBVIRTD LIBVIRT_DRIVER_RESULT_INTERFACE diff --git a/m4/virt-driver-remote.m4 b/m4/virt-driver-remote.m4 deleted file mode 100644 index 8d98e369b35..00000000000 --- a/m4/virt-driver-remote.m4 +++ /dev/null @@ -1,48 +0,0 @@ -dnl The remote 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_REMOTE], [ - LIBVIRT_ARG_WITH_FEATURE([REMOTE], [remote driver], [yes]) - LIBVIRT_ARG_WITH([REMOTE_DEFAULT_MODE], [remote driver default mode], [l= egacy]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [ - if test "$with_remote" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled= ]) - fi - AM_CONDITIONAL([WITH_REMOTE], [test "$with_remote" =3D "yes"]) - - case "$with_remote_default_mode" in - legacy) - REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_LEGACY - ;; - direct) - REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_DIRECT - ;; - *) - AC_MSG_ERROR([Unknown remote mode '$with_remote_default_mode']) - ;; - esac - - AC_DEFINE_UNQUOTED([REMOTE_DRIVER_MODE_DEFAULT],[$REMOTE_DRIVER_MODE_DEF= AULT], [Default remote driver mode]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_REMOTE], [ - LIBVIRT_RESULT([Remote], [$with_remote]) -]) diff --git a/meson.build b/meson.build index 13062279c0a..6c31ae6c848 100644 --- a/meson.build +++ b/meson.build @@ -1537,6 +1537,19 @@ if conf.has('WITH_VIRTUALPORT') and not conf.has('WI= TH_MACVTAP') endif =20 =20 +# build driver options + +if get_option('driver_remote').enabled() + if not xdr_dep.found() and host_machine.system() not in [ 'freebsd', 'da= rwin' ] + error('XDR is required for remote driver') + endif + conf.set('WITH_REMOTE', 1) +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)) + + # define top include directory =20 top_inc_dir =3D include_directories('.') @@ -1555,6 +1568,11 @@ configure_file(output: 'meson-config.h', configurati= on: conf) =20 # print configuration summary =20 +driver_summary =3D { + 'Remote': conf.has('WITH_REMOTE'), +} +summary(driver_summary, section: 'Drivers', bool_yn: true) + libs_summary =3D { 'acl': acl_dep.found(), 'apparmor': apparmor_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index a0615fcfdc1..4360540bf5a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -44,3 +44,8 @@ option('virtualport', type: 'feature', value: 'auto', des= cription: 'enable virtu option('wireshark_dissector', type: 'feature', value: 'auto', description:= 'wireshark support') option('wireshark_plugindir', type: 'string', value: '', description: 'wir= eshark plugins directory for use when installing wireshark plugin') option('yajl', type: 'feature', value: 'auto', description: 'yajl support') + + +# build driver options +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