meson: add OpenVZ driver build option

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index d6d8bdab6370f7f4d8135cbb0049fa6eb2afbb91..ac9569313882b506386ffc02df572b90073f7e73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,7 +104,6 @@ dnl Virtualization drivers check
 dnl
 
 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
 
 LIBVIRT_DRIVER_CHECK_QEMU
-LIBVIRT_DRIVER_CHECK_OPENVZ
 LIBVIRT_DRIVER_CHECK_VMWARE
 LIBVIRT_DRIVER_CHECK_VBOX
 LIBVIRT_DRIVER_CHECK_VZ
@@ -312,7 +310,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 (file)
index 3ad682b..0000000
--- 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 <http://www.gnu.org/licenses/>.
-dnl
-
-AC_DEFUN([LIBVIRT_DRIVER_ARG_OPENVZ], [
-  LIBVIRT_ARG_WITH_FEATURE([OPENVZ], [OpenVZ], [check])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_CHECK_OPENVZ], [
-  if test "$with_openvz" = "check"; then
-    with_openvz=$with_linux
-  fi
-
-  if test "$with_openvz" = "yes" && test "$with_linux" = "no"; then
-    AC_MSG_ERROR([The OpenVZ driver can be enabled on Linux only.])
-  fi
-
-  if test "$with_openvz" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled])
-  fi
-
-  AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_RESULT_OPENVZ], [
-  LIBVIRT_RESULT([OpenVZ], [$with_openvz])
-])

diff --git a/meson.build b/meson.build
index 54da8d44162927cf61c4c155341704b88b47c90d..923d0c27990024da0c335859076fd2b9f1f431d9 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1701,6 +1701,12 @@ elif get_option('driver_lxc').enabled()
   error('linux and remote_driver are required for LXC')
 endif
 
+if not get_option('driver_openvz').disabled() and host_machine.system() == 'linux'
+  conf.set('WITH_OPENVZ', 1)
+elif get_option('driver_openvz').enabled()
+  error('OpenVZ driver can be enabled on Linux only')
+endif
+
 
 # define top include directory
 
@@ -1721,6 +1727,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
 # print configuration summary
 
 driver_summary = {
+  '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 f28692ae2a9a0ea730d1b5bc842f744d17bc5c20..2c06d8ede9de6468095c90cc94a291144beefe91 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -54,5 +54,6 @@ option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hyper-V dr
 option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver')
 option('driver_libxl', type: 'feature', value: 'auto', description: 'libxenlight driver')
 option('driver_lxc', type: 'feature', value: 'auto', description: 'Linux Container driver')
+option('driver_openvz', type: 'feature', value: 'auto', description: 'OpenVZ driver')
 option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver')
 option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode')