NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

meson: add VMWare driver build option

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-04-30 01:08:19 +02:00
parent 662ac45993
commit 03677e366d
4 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -97,12 +97,10 @@ dnl
dnl Virtualization drivers check dnl Virtualization drivers check
dnl dnl
LIBVIRT_DRIVER_ARG_VMWARE
LIBVIRT_DRIVER_ARG_VZ LIBVIRT_DRIVER_ARG_VZ
LIBVIRT_DRIVER_ARG_NETWORK LIBVIRT_DRIVER_ARG_NETWORK
LIBVIRT_DRIVER_ARG_INTERFACE LIBVIRT_DRIVER_ARG_INTERFACE
LIBVIRT_DRIVER_CHECK_VMWARE
LIBVIRT_DRIVER_CHECK_VZ LIBVIRT_DRIVER_CHECK_VZ
LIBVIRT_DRIVER_CHECK_NETWORK LIBVIRT_DRIVER_CHECK_NETWORK
LIBVIRT_DRIVER_CHECK_INTERFACE LIBVIRT_DRIVER_CHECK_INTERFACE
@ -297,7 +295,6 @@ AC_MSG_NOTICE([=====================])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([Drivers])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_DRIVER_RESULT_VMWARE
LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_VZ
LIBVIRT_DRIVER_RESULT_NETWORK LIBVIRT_DRIVER_RESULT_NETWORK
LIBVIRT_DRIVER_RESULT_INTERFACE LIBVIRT_DRIVER_RESULT_INTERFACE

33
m4/virt-driver-vmware.m4
View File

@ -1,33 +0,0 @@
dnl The VMware driver check
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_VMWARE], [
LIBVIRT_ARG_WITH_FEATURE([VMWARE], [VMware], [yes])
])
AC_DEFUN([LIBVIRT_DRIVER_CHECK_VMWARE], [
if test "$with_vmware" = "yes"; then
AC_DEFINE_UNQUOTED([WITH_VMWARE], 1, [whether VMware driver is enabled])
fi
AM_CONDITIONAL([WITH_VMWARE], [test "$with_vmware" = "yes"])
])
AC_DEFUN([LIBVIRT_DRIVER_RESULT_VMWARE], [
LIBVIRT_RESULT([VMware], [$with_vmware])
])

6
meson.build
View File

@ -1831,6 +1831,11 @@ if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD')
conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir'))
endif endif
if get_option('driver_vmware').enabled()
conf.set('WITH_VMWARE', 1)
conf.set('WITH_VMX', 1)
endif
# define top include directory # define top include directory
@ -1853,6 +1858,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
driver_summary = { driver_summary = {
'QEMU': conf.has('WITH_QEMU'), 'QEMU': conf.has('WITH_QEMU'),
'OpenVZ': conf.has('WITH_OPENVZ'), 'OpenVZ': conf.has('WITH_OPENVZ'),
'VMware': conf.has('WITH_VMWARE'),
'VBox': conf.has('WITH_VBOX'), 'VBox': conf.has('WITH_VBOX'),
'libxl': conf.has('WITH_LIBXL'), 'libxl': conf.has('WITH_LIBXL'),
'LXC': conf.has('WITH_LXC'), 'LXC': conf.has('WITH_LXC'),

1
meson_options.txt
View File

@ -63,3 +63,4 @@ option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], valu
option('driver_test', type: 'feature', value: 'enabled', description: 'test driver') option('driver_test', type: 'feature', value: 'enabled', description: 'test driver')
option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver') option('driver_vbox', type: 'feature', value: 'enabled', description: 'VirtualBox XPCOMC driver')
option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library') option('vbox_xpcomc_dir', type: 'string', value: '', description: 'Location of directory containing VirtualBox XPCOMC library')
option('driver_vmware', type: 'feature', value: 'enabled', description: 'VMware driver')