mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
configure, meson: move CONFIG_IVSHMEM to meson
This is a duplicate of CONFIG_EVENTFD, handle it directly in meson.build. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6d7c7c2d1d
commit
ccd250aa2d
8
configure
vendored
8
configure
vendored
|
@ -5037,11 +5037,6 @@ if test "$mingw32" = "yes" ; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We can only support ivshmem if we have eventfd
|
|
||||||
if [ "$eventfd" = "yes" ]; then
|
|
||||||
ivshmem=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Probe for guest agent support/options
|
# Probe for guest agent support/options
|
||||||
|
|
||||||
if [ "$guest_agent" != "no" ]; then
|
if [ "$guest_agent" != "no" ]; then
|
||||||
|
@ -5639,9 +5634,6 @@ fi
|
||||||
if test "$have_getrandom" = "yes" ; then
|
if test "$have_getrandom" = "yes" ; then
|
||||||
echo "CONFIG_GETRANDOM=y" >> $config_host_mak
|
echo "CONFIG_GETRANDOM=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$ivshmem" = "yes" ; then
|
|
||||||
echo "CONFIG_IVSHMEM=y" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$debug_mutex" = "yes" ; then
|
if test "$debug_mutex" = "yes" ; then
|
||||||
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
|
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -303,5 +303,5 @@ variable::
|
||||||
host_kconfig = \
|
host_kconfig = \
|
||||||
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
|
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
|
||||||
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
|
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
|
||||||
('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=y'] : []) + \
|
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
|
||||||
...
|
...
|
||||||
|
|
|
@ -1335,10 +1335,11 @@ if link_language == 'cpp'
|
||||||
}
|
}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
have_ivshmem = config_host.has_key('CONFIG_EVENTFD')
|
||||||
host_kconfig = \
|
host_kconfig = \
|
||||||
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
|
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
|
||||||
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=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'] : []) + \
|
('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \
|
||||||
(x11.found() ? ['CONFIG_X11=y'] : []) + \
|
(x11.found() ? ['CONFIG_X11=y'] : []) + \
|
||||||
('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \
|
('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \
|
||||||
|
@ -2489,7 +2490,7 @@ if have_tools
|
||||||
install: true)
|
install: true)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if 'CONFIG_IVSHMEM' in config_host
|
if have_ivshmem
|
||||||
subdir('contrib/ivshmem-client')
|
subdir('contrib/ivshmem-client')
|
||||||
subdir('contrib/ivshmem-server')
|
subdir('contrib/ivshmem-server')
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue