[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/26] configure, meson: move CONFIG_IVSHMEM to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 17/26] configure, meson: move CONFIG_IVSHMEM to meson |
Date: |
Tue, 8 Jun 2021 13:22:52 +0200 |
This is a duplicate of CONFIG_EVENTFD, handle it directly in meson.build.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 8 --------
docs/devel/kconfig.rst | 2 +-
meson.build | 5 +++--
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 2c0f16488e..c95259435f 100755
--- a/configure
+++ b/configure
@@ -5038,11 +5038,6 @@ if test "$mingw32" = "yes" ; then
done
fi
-# We can only support ivshmem if we have eventfd
-if [ "$eventfd" = "yes" ]; then
- ivshmem=yes
-fi
-
# Probe for guest agent support/options
if [ "$guest_agent" != "no" ]; then
@@ -5638,9 +5633,6 @@ fi
if test "$have_getrandom" = "yes" ; then
echo "CONFIG_GETRANDOM=y" >> $config_host_mak
fi
-if test "$ivshmem" = "yes" ; then
- echo "CONFIG_IVSHMEM=y" >> $config_host_mak
-fi
if test "$debug_mutex" = "yes" ; then
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
fi
diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst
index cb2d7ffac0..a1cdbec751 100644
--- a/docs/devel/kconfig.rst
+++ b/docs/devel/kconfig.rst
@@ -303,5 +303,5 @@ variable::
host_kconfig = \
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
- ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \
+ (have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
...
diff --git a/meson.build b/meson.build
index 38f6f193f5..3be3ef0982 100644
--- a/meson.build
+++ b/meson.build
@@ -1337,10 +1337,11 @@ if link_language == 'cpp'
}
endif
+have_ivshmem = config_host.has_key('CONFIG_EVENTFD')
host_kconfig = \
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
- ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \
+ (have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \
(x11.found() ? ['CONFIG_X11=y'] : []) + \
('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \
@@ -2499,7 +2500,7 @@ if have_tools
install: true)
endif
- if 'CONFIG_IVSHMEM' in config_host
+ if have_ivshmem
subdir('contrib/ivshmem-client')
subdir('contrib/ivshmem-server')
endif
--
2.31.1
- Re: [PATCH 13/26] configure, meson: convert liburing detection to meson, (continued)
- [PATCH 12/26] configure, meson: convert libpmem detection to meson, Paolo Bonzini, 2021/06/08
- [PATCH 20/26] meson: store dependency('threads') in a variable, Paolo Bonzini, 2021/06/08
- [PATCH 17/26] configure, meson: move CONFIG_IVSHMEM to meson,
Paolo Bonzini <=
- [PATCH 21/26] configure: convert compiler tests to meson, part 2, Paolo Bonzini, 2021/06/08
- [PATCH 23/26] configure: convert CONFIG_STATIC_ASSERT tests to meson, Paolo Bonzini, 2021/06/08
- [PATCH 22/26] configure: convert compiler tests to meson, part 3, Paolo Bonzini, 2021/06/08
- [PATCH 26/26] configure: convert compiler tests to meson, part 6, Paolo Bonzini, 2021/06/08