From nobody Sun Feb 8 09:12:13 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=1594894030; cv=none; d=zohomail.com; s=zohoarc; b=cua94Ls6ifXg3dX53pr2ELkr1WNlFSsU56HGWmX/QXf+hz8i4AH9F5TVKU1DSxcIMfmdNy/bh3xT/7fMVKU2Hx3RNiHadmMHqZxiN+YzqcxTv0d8o1HZx5CgbT/NvtLhYvEuAoA5M5tRCrs/B8J3D+XA1pWS7w54tLfzk1cFwgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894030; 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=MLTCi80Ls2DMVVZG4xMEkRWk7KrhksfodzKoJp/K8AE=; b=ikenTbRoOScMvoFHzk1uoIzzY8ufN4Z59Iq91HeAmWMfCbYeEXk7+/9hOXW5Z/1SbRO5auSGevJdIgik61NXR47kXbBX/vzccFak87Pa0b4ErW58VXr/nTlPpayCuF9MAqa8BIEnPK4ZiBD5v2epVHaoHv3lWO5OH6hQPIWNV0k= 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 159489403019766.75708780193395; Thu, 16 Jul 2020 03:07:10 -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-131-sU6lLi6qMKaWgPFDw6fvow-1; Thu, 16 Jul 2020 06:03:09 -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 A6BE5802C40; Thu, 16 Jul 2020 10:02:48 +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 75AAE2E023; Thu, 16 Jul 2020 10:02:48 +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 3F1901806B0D; Thu, 16 Jul 2020 10:02:48 +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 06GA2hpe016638 for ; Thu, 16 Jul 2020 06:02:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 62E1E2B6E2; Thu, 16 Jul 2020 10:02:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id D11C82B6DB for ; Thu, 16 Jul 2020 10:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894028; 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=MLTCi80Ls2DMVVZG4xMEkRWk7KrhksfodzKoJp/K8AE=; b=RXNZq6netbPkxLWo1ZM1O4hUnJ6AjhdtUPedaRsc/zGTAA5AVh2rI9I/OJbXfBObPDpyj8 7pbW0gHoo5/oOMXtjh5eNX5vSLadeHOJfnY+uOkwSOgUXmcwrg6KHpPUjkR0rJrhtlxPq8 NTnv8wXVkCvXlEQjoXHbdsGQZpL0oSE= X-MC-Unique: sU6lLi6qMKaWgPFDw6fvow-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 084/351] meson: add Hyper-V driver build option Date: Thu, 16 Jul 2020 11:55:20 +0200 Message-Id: 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-driver-hyperv.m4 | 47 ---------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 m4/virt-driver-hyperv.m4 diff --git a/configure.ac b/configure.ac index a85c52bea14..84cd16f4d95 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_VZ -LIBVIRT_DRIVER_ARG_HYPERV LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE @@ -128,7 +127,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_LXC LIBVIRT_DRIVER_CHECK_VZ -LIBVIRT_DRIVER_CHECK_HYPERV LIBVIRT_DRIVER_CHECK_TEST LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_INTERFACE @@ -331,7 +329,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LXC -LIBVIRT_DRIVER_RESULT_HYPERV LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_TEST LIBVIRT_DRIVER_RESULT_NETWORK diff --git a/m4/virt-driver-hyperv.m4 b/m4/virt-driver-hyperv.m4 deleted file mode 100644 index f276a881f3b..00000000000 --- a/m4/virt-driver-hyperv.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl The Hyper-V 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_HYPERV], [ - LIBVIRT_ARG_WITH_FEATURE([HYPERV], [Hyper-V], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_HYPERV], [ - AC_REQUIRE([LIBVIRT_CHECK_OPENWSMAN]) - - if test "$with_hyperv" !=3D "no"; then - if test "$with_openwsman" !=3D "yes"; then - if test "$with_hyperv" =3D "check"; then - with_hyperv=3Dno - else - AC_MSG_ERROR([openwsman is required for the Hyper-V driver]) - fi - else - with_hyperv=3Dyes - fi - fi - - if test "$with_hyperv" =3D "yes" ; then - AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enable= d]) - fi - AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_HYPERV], [ - LIBVIRT_RESULT([Hyper-V], [$with_hyperv]) -]) diff --git a/meson.build b/meson.build index 153790c29ec..3c1ccb8f600 100644 --- a/meson.build +++ b/meson.build @@ -1593,6 +1593,12 @@ elif get_option('driver_esx').enabled() error('Curl is required for the ESX driver') endif =20 +if not get_option('driver_hyperv').disabled() and openwsman_dep.found() + conf.set('WITH_HYPERV', 1) +elif get_option('driver_hyperv').enabled() + error('openwsman is required for the Hyper-V driver') +endif + =20 # define top include directory =20 @@ -1614,6 +1620,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) =20 driver_summary =3D { 'ESX': conf.has('WITH_ESX'), + 'Hyper-V': conf.has('WITH_HYPERV'), 'Bhyve': conf.has('WITH_BHYVE'), 'Remote': conf.has('WITH_REMOTE'), 'Libvirtd': conf.has('WITH_LIBVIRTD'), diff --git a/meson_options.txt b/meson_options.txt index 700b7d41287..c64700fcc4e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,6 +49,7 @@ option('yajl', type: 'feature', value: 'auto', descriptio= n: 'yajl support') # build driver options 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_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