From nobody Sun Feb 8 18:33:19 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=1594894024; cv=none; d=zohomail.com; s=zohoarc; b=cYBPASh4PvuCoohbVdLwBzA/tq+wK7Q7cADrwKJHQtkIvzSNTRSL/azPcrEr3Nc2g3Un+uKT44qJceqnLA5tCRTdsxLUtvGg2Pf7qla1QpThtKfZpsYlWbo9iGV81bEx/4sdJ8YkerYHYWGyrSKoour7PFrylSEdRlltXQRIMnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894024; 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=SpfuwQNk8ijbnDCaWZZWydp6KpjhmVfwPl9hjtlsEfQ=; b=dG6ERRJO5+525dgeW6vdFDfmWt5ZqApkAA5SKD5Y0Mq8X3SBGgFX/6kljPY0VKwLcjkZh1nyBFl3Pmv7+2SZMugwv55HGX9iZBN9G0L2ThCVlpu+pBR0kkLCH+qUQwQSwEinOg93Xh0jC+k0ysOwggiHvYvW5QkZ9i6eD/DpKws= 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 1594894024098931.2576232941052; Thu, 16 Jul 2020 03:07:04 -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-17-XSARr7I9P_GtHq8q7vJBmQ-1; Thu, 16 Jul 2020 06:03:13 -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 2C09680DAE6; Thu, 16 Jul 2020 10:02:54 +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 D05A270108; Thu, 16 Jul 2020 10:02:53 +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 9ACE896236; Thu, 16 Jul 2020 10:02:53 +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 06GA2kwM016668 for ; Thu, 16 Jul 2020 06:02:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 247D42DE6D; Thu, 16 Jul 2020 10:02:46 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BADE2B6E2 for ; Thu, 16 Jul 2020 10:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894023; 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=SpfuwQNk8ijbnDCaWZZWydp6KpjhmVfwPl9hjtlsEfQ=; b=VDyFkw7bb0bImKr40hs0ehui/JqFIF1fKtpSLEAzmkGwPAOyhDvCHbHjF3aCX+pJvw0Xn6 YTNuUu4kIjw7hS873fQrNvKqBbstQOCr7NRYQtFl5dNnRD1QF5tcg7Ztycdy1h/xt9Qwkm a8DwlMOSmTcX2hA4rNbFZHni6F6He8g= X-MC-Unique: XSARr7I9P_GtHq8q7vJBmQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 087/351] meson: add OpenVZ driver build option Date: Thu, 16 Jul 2020 11:55:23 +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.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 | 3 --- m4/virt-driver-openvz.m4 | 42 ---------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 m4/virt-driver-openvz.m4 diff --git a/configure.ac b/configure.ac index 3139b41a36a..30b84856d38 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,6 @@ dnl Virtualization drivers check dnl =20 LIBVIRT_DRIVER_ARG_QEMU -LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VZ @@ -113,7 +112,6 @@ LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_INTERFACE =20 LIBVIRT_DRIVER_CHECK_QEMU -LIBVIRT_DRIVER_CHECK_OPENVZ LIBVIRT_DRIVER_CHECK_VMWARE LIBVIRT_DRIVER_CHECK_VBOX LIBVIRT_DRIVER_CHECK_VZ @@ -314,7 +312,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) LIBVIRT_DRIVER_RESULT_QEMU -LIBVIRT_DRIVER_RESULT_OPENVZ LIBVIRT_DRIVER_RESULT_VMWARE LIBVIRT_DRIVER_RESULT_VBOX LIBVIRT_DRIVER_RESULT_VZ diff --git a/m4/virt-driver-openvz.m4 b/m4/virt-driver-openvz.m4 deleted file mode 100644 index 3ad682b3437..00000000000 --- a/m4/virt-driver-openvz.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl The OpenVZ 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_OPENVZ], [ - LIBVIRT_ARG_WITH_FEATURE([OPENVZ], [OpenVZ], [check]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_CHECK_OPENVZ], [ - if test "$with_openvz" =3D "check"; then - with_openvz=3D$with_linux - fi - - if test "$with_openvz" =3D "yes" && test "$with_linux" =3D "no"; then - AC_MSG_ERROR([The OpenVZ driver can be enabled on Linux only.]) - fi - - if test "$with_openvz" =3D "yes"; then - AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled= ]) - fi - - AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" =3D "yes"]) -]) - -AC_DEFUN([LIBVIRT_DRIVER_RESULT_OPENVZ], [ - LIBVIRT_RESULT([OpenVZ], [$with_openvz]) -]) diff --git a/meson.build b/meson.build index 2ed93e857d0..cae9743f5b2 100644 --- a/meson.build +++ b/meson.build @@ -1683,6 +1683,12 @@ elif get_option('driver_lxc').enabled() error('linux and remote_driver are required for LXC') endif =20 +if not get_option('driver_openvz').disabled() and host_machine.system() = =3D=3D 'linux' + conf.set('WITH_OPENVZ', 1) +elif get_option('driver_openvz').enabled() + error('OpenVZ driver can be enabled on Linux only') +endif + =20 # define top include directory =20 @@ -1703,6 +1709,7 @@ configure_file(output: 'meson-config.h', configuratio= n: conf) # print configuration summary =20 driver_summary =3D { + 'OpenVZ': conf.has('WITH_OPENVZ'), 'libxl': conf.has('WITH_LIBXL'), 'LXC': conf.has('WITH_LXC'), 'ESX': conf.has('WITH_ESX'), diff --git a/meson_options.txt b/meson_options.txt index ccc0a209378..dbe56561752 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -53,5 +53,6 @@ option('driver_hyperv', type: 'feature', value: 'auto', d= escription: 'Hyper-V dr 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') +option('driver_openvz', type: 'feature', value: 'auto', description: 'Open= VZ 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