* [PATCH 01/27] meson: use .allowed() method for features
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-04 3:47 ` Richard Henderson
2022-02-03 17:33 ` [PATCH 02/27] meson: use .require() and .disable_auto_if() " Paolo Bonzini
` (25 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
The method is now in 0.59, using it simplifies some boolean conditions.
The other new methods .require() and .disable_auto_if() can be used too,
but introducing them is not just a matter of search-and-replace.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 42 +++++++++++++++++++++---------------------
tests/meson.build | 2 +-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/meson.build b/meson.build
index 82db1e7e74..637ee08eb1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('qemu', ['c'], meson_version: '>=0.58.2',
+project('qemu', ['c'], meson_version: '>=0.59.3',
default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto',
'b_staticpic=false', 'stdsplit=false'],
version: files('VERSION'))
@@ -99,7 +99,7 @@ else
endif
kvm_targets_c = '""'
-if not get_option('kvm').disabled() and targetos == 'linux'
+if get_option('kvm').allowed() and targetos == 'linux'
kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"'
endif
config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c)
@@ -276,7 +276,7 @@ endif
if targetos != 'linux' and get_option('multiprocess').enabled()
error('Multiprocess QEMU is supported only on Linux')
endif
-multiprocess_allowed = targetos == 'linux' and not get_option('multiprocess').disabled()
+multiprocess_allowed = targetos == 'linux' and get_option('multiprocess').allowed()
# Target-specific libraries and flags
libm = cc.find_library('m', required: false)
@@ -313,7 +313,7 @@ elif targetos == 'haiku'
cc.find_library('network'),
cc.find_library('bsd')]
elif targetos == 'openbsd'
- if not get_option('tcg').disabled() and target_dirs.length() > 0
+ if get_option('tcg').allowed() and target_dirs.length() > 0
# Disable OpenBSD W^X if available
emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded')
endif
@@ -321,16 +321,16 @@ endif
# Target-specific configuration of accelerators
accelerators = []
-if not get_option('kvm').disabled() and targetos == 'linux'
+if get_option('kvm').allowed() and targetos == 'linux'
accelerators += 'CONFIG_KVM'
endif
-if not get_option('xen').disabled() and 'CONFIG_XEN_BACKEND' in config_host
+if get_option('xen').allowed() and 'CONFIG_XEN_BACKEND' in config_host
accelerators += 'CONFIG_XEN'
- have_xen_pci_passthrough = not get_option('xen_pci_passthrough').disabled() and targetos == 'linux'
+ have_xen_pci_passthrough = get_option('xen_pci_passthrough').allowed() and targetos == 'linux'
else
have_xen_pci_passthrough = false
endif
-if not get_option('whpx').disabled() and targetos == 'windows'
+if get_option('whpx').allowed() and targetos == 'windows'
if get_option('whpx').enabled() and host_machine.cpu() != 'x86_64'
error('WHPX requires 64-bit host')
elif cc.has_header('WinHvPlatform.h', required: get_option('whpx')) and \
@@ -338,14 +338,14 @@ if not get_option('whpx').disabled() and targetos == 'windows'
accelerators += 'CONFIG_WHPX'
endif
endif
-if not get_option('hvf').disabled()
+if get_option('hvf').allowed()
hvf = dependency('appleframeworks', modules: 'Hypervisor',
required: get_option('hvf'))
if hvf.found()
accelerators += 'CONFIG_HVF'
endif
endif
-if not get_option('hax').disabled()
+if get_option('hax').allowed()
if get_option('hax').enabled() or targetos in ['windows', 'darwin', 'netbsd']
accelerators += 'CONFIG_HAX'
endif
@@ -358,7 +358,7 @@ if targetos == 'netbsd'
endif
tcg_arch = host_arch
-if not get_option('tcg').disabled()
+if get_option('tcg').allowed()
if host_arch == 'unknown'
if get_option('tcg_interpreter')
warning('Unsupported CPU @0@, will use TCG with TCI (slow)'.format(cpu))
@@ -472,7 +472,7 @@ libattr_test = '''
libattr = not_found
have_old_libattr = false
-if not get_option('attr').disabled()
+if get_option('attr').allowed()
if cc.links(libattr_test)
libattr = declare_dependency()
else
@@ -628,7 +628,7 @@ endif
mpathlibs = [libudev]
mpathpersist = not_found
mpathpersist_new_api = false
-if targetos == 'linux' and have_tools and not get_option('mpath').disabled()
+if targetos == 'linux' and have_tools and get_option('mpath').allowed()
mpath_test_source_new = '''
#include <libudev.h>
#include <mpath_persist.h>
@@ -697,7 +697,7 @@ endif
iconv = not_found
curses = not_found
-if have_system and not get_option('curses').disabled()
+if have_system and get_option('curses').allowed()
curses_test = '''
#if defined(__APPLE__) || defined(__OpenBSD__)
#define _XOPEN_SOURCE_EXTENDED 1
@@ -759,7 +759,7 @@ if have_system and not get_option('curses').disabled()
endforeach
endif
endif
- if not get_option('iconv').disabled()
+ if get_option('iconv').allowed()
foreach link_args : [ ['-liconv'], [] ]
# Programs will be linked with glib and this will bring in libiconv on FreeBSD.
# We need to use libiconv if available because mixing libiconv's headers with
@@ -938,7 +938,7 @@ if liblzfse.found() and not cc.links('''
endif
oss = not_found
-if have_system and not get_option('oss').disabled()
+if get_option('oss').allowed() and have_system
if not cc.has_header('sys/soundcard.h')
# not found
elif targetos == 'netbsd'
@@ -1092,7 +1092,7 @@ vnc = not_found
png = not_found
jpeg = not_found
sasl = not_found
-if have_system and not get_option('vnc').disabled()
+if get_option('vnc').allowed() and have_system
vnc = declare_dependency() # dummy dependency
png = dependency('libpng', required: get_option('vnc_png'),
method: 'pkg-config', kwargs: static_kwargs)
@@ -1236,7 +1236,7 @@ selinux = dependency('libselinux',
malloc = []
if get_option('malloc') == 'system'
has_malloc_trim = \
- not get_option('malloc_trim').disabled() and \
+ get_option('malloc_trim').allowed() and \
cc.links('''#include <malloc.h>
int main(void) { malloc_trim(0); return 0; }''')
else
@@ -1291,7 +1291,7 @@ fuse = dependency('fuse3', required: get_option('fuse'),
kwargs: static_kwargs)
fuse_lseek = not_found
-if not get_option('fuse_lseek').disabled()
+if get_option('fuse_lseek').allowed()
if fuse.version().version_compare('>=3.8')
# Dummy dependency
fuse_lseek = declare_dependency()
@@ -1714,7 +1714,7 @@ config_host_data.set('HAVE_MLOCKALL', cc.links(gnu_source_prefix + '''
}'''))
have_l2tpv3 = false
-if not get_option('l2tpv3').disabled() and have_system
+if get_option('l2tpv3').allowed() and have_system
have_l2tpv3 = cc.has_type('struct mmsghdr',
prefix: gnu_source_prefix + '''
#include <sys/socket.h>
@@ -1723,7 +1723,7 @@ endif
config_host_data.set('CONFIG_L2TPV3', have_l2tpv3)
have_netmap = false
-if not get_option('netmap').disabled() and have_system
+if get_option('netmap').allowed() and have_system
have_netmap = cc.compiles('''
#include <inttypes.h>
#include <net/if.h>
diff --git a/tests/meson.build b/tests/meson.build
index 079c8f3727..1d05109eb4 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -85,7 +85,7 @@ if 'CONFIG_TCG' in config_all
subdir('fp')
endif
-if not get_option('tcg').disabled()
+if get_option('tcg').allowed()
if 'CONFIG_PLUGIN' in config_host
subdir('plugin')
endif
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 01/27] meson: use .allowed() method for features
2022-02-03 17:33 ` [PATCH 01/27] meson: use .allowed() method for features Paolo Bonzini
@ 2022-02-04 3:47 ` Richard Henderson
0 siblings, 0 replies; 46+ messages in thread
From: Richard Henderson @ 2022-02-04 3:47 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: marcandre.lureau
On 2/4/22 04:33, Paolo Bonzini wrote:
> The method is now in 0.59, using it simplifies some boolean conditions.
> The other new methods .require() and .disable_auto_if() can be used too,
> but introducing them is not just a matter of search-and-replace.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> meson.build | 42 +++++++++++++++++++++---------------------
> tests/meson.build | 2 +-
> 2 files changed, 22 insertions(+), 22 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 02/27] meson: use .require() and .disable_auto_if() method for features
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
2022-02-03 17:33 ` [PATCH 01/27] meson: use .allowed() method for features Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 03/27] configure, meson: move AVX tests to meson Paolo Bonzini
` (24 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
The method is now in 0.59, using it simplifies some conditionals.
There is a small change, which is to build virtfs-proxy-helper in a
tools-only build. This is done for consistency with other tools,
which are not culled by the absence of system emulator binaries.
.disable_auto_if() would also be useful to check for packages,
for example
-linux_io_uring = not_found
-if not get_option('linux_io_uring').auto() or have_block
- linux_io_uring = dependency('liburing', required: get_option('linux_io_uring'),
- method: 'pkg-config', kwargs: static_kwargs)
-endif
+linux_io_uring = dependency('liburing',
+ required: get_option('linux_io_uring').disable_auto_if(not have_block),
+ method: 'pkg-config', kwargs: static_kwargs)
This change however is much larger and I am not sure about the improved
readability, so I am not performing it right now.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 74 ++++++++++++++++++-----------------------------
tools/meson.build | 31 ++++++--------------
2 files changed, 37 insertions(+), 68 deletions(-)
diff --git a/meson.build b/meson.build
index 637ee08eb1..9ef0286f21 100644
--- a/meson.build
+++ b/meson.build
@@ -269,14 +269,12 @@ if 'syslog' in get_option('trace_backends') and not cc.compiles('''
endif
# Miscellaneous Linux-only features
-if targetos != 'linux' and get_option('mpath').enabled()
- error('Multipath is supported only on Linux')
-endif
+get_option('mpath') \
+ .require(targetos == 'linux', error_message: 'Multipath is supported only on Linux')
-if targetos != 'linux' and get_option('multiprocess').enabled()
- error('Multiprocess QEMU is supported only on Linux')
-endif
-multiprocess_allowed = targetos == 'linux' and get_option('multiprocess').allowed()
+multiprocess_allowed = get_option('multiprocess') \
+ .require(targetos == 'linux', error_message: 'Multiprocess QEMU is supported only on Linux') \
+ .allowed()
# Target-specific libraries and flags
libm = cc.find_library('m', required: false)
@@ -1268,19 +1266,13 @@ statx_test = gnu_source_prefix + '''
has_statx = cc.links(statx_test)
-have_vhost_user_blk_server = (targetos == 'linux' and
- 'CONFIG_VHOST_USER' in config_host)
-
-if get_option('vhost_user_blk_server').enabled()
- if targetos != 'linux'
- error('vhost_user_blk_server requires linux')
- elif 'CONFIG_VHOST_USER' not in config_host
- error('vhost_user_blk_server requires vhost-user support')
- endif
-elif get_option('vhost_user_blk_server').disabled() or not have_system
- have_vhost_user_blk_server = false
-endif
-
+have_vhost_user_blk_server = get_option('vhost_user_blk_server') \
+ .require(targetos == 'linux',
+ error_message: 'vhost_user_blk_server requires linux') \
+ .require('CONFIG_VHOST_USER' in config_host,
+ error_message: 'vhost_user_blk_server requires vhost-user support') \
+ .disable_auto_if(not have_system) \
+ .allowed()
if get_option('fuse').disabled() and get_option('fuse_lseek').enabled()
error('Cannot enable fuse-lseek while fuse is disabled')
@@ -1407,36 +1399,26 @@ endif
have_host_block_device = (targetos != 'darwin' or
cc.has_header('IOKit/storage/IOMedia.h'))
-dbus_display = false
-if not get_option('dbus_display').disabled()
- # FIXME enable_modules shouldn't be necessary, but: https://github.com/mesonbuild/meson/issues/8333
- dbus_display = gio.version().version_compare('>=2.64') and config_host.has_key('GDBUS_CODEGEN') and enable_modules
- if get_option('dbus_display').enabled() and not dbus_display
- error('Requirements missing to enable -display dbus (glib>=2.64 && --enable-modules)')
- endif
-endif
+# FIXME enable_modules shouldn't be necessary, but: https://github.com/mesonbuild/meson/issues/8333
+dbus_display = get_option('dbus_display') \
+ .require(gio.version().version_compare('>=2.64'),
+ error_message: '-display dbus requires glib>=2.64') \
+ .require(enable_modules,
+ error_message: '-display dbus requires --enable-modules') \
+ .require(config_host.has_key('GDBUS_CODEGEN'),
+ error_message: '-display dbus requires gdbus-codegen') \
+ .allowed()
-have_virtfs = (targetos == 'linux' and
- have_system and
- libattr.found() and
- libcap_ng.found())
+have_virtfs = get_option('virtfs') \
+ .require(targetos == 'linux',
+ error_message: 'virtio-9p (virtfs) requires Linux') \
+ .require(libattr.found() and libcap_ng.found(),
+ error_message: 'virtio-9p (virtfs) requires libcap-ng-devel and libattr-devel') \
+ .disable_auto_if(not have_tools and not have_system) \
+ .allowed()
have_virtfs_proxy_helper = have_virtfs and have_tools
-if get_option('virtfs').enabled()
- if not have_virtfs
- if targetos != 'linux'
- error('virtio-9p (virtfs) requires Linux')
- elif not libcap_ng.found() or not libattr.found()
- error('virtio-9p (virtfs) requires libcap-ng-devel and libattr-devel')
- elif not have_system
- error('virtio-9p (virtfs) needs system emulation support')
- endif
- endif
-elif get_option('virtfs').disabled()
- have_virtfs = false
-endif
-
foreach k : get_option('trace_backends')
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
endforeach
diff --git a/tools/meson.build b/tools/meson.build
index 3e5a0abfa2..46977af84f 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,25 +1,12 @@
-have_virtiofsd = (targetos == 'linux' and
- have_tools and
- seccomp.found() and
- libcap_ng.found() and
- 'CONFIG_VHOST_USER' in config_host)
-
-if get_option('virtiofsd').enabled()
- if not have_virtiofsd
- if targetos != 'linux'
- error('virtiofsd requires Linux')
- elif not seccomp.found() or not libcap_ng.found()
- error('virtiofsd requires libcap-ng-devel and seccomp-devel')
- elif 'CONFIG_VHOST_USER' not in config_host
- error('virtiofsd needs vhost-user support')
- else
- # Disabled all the tools but virtiofsd.
- have_virtiofsd = true
- endif
- endif
-elif get_option('virtiofsd').disabled() or not have_system
- have_virtiofsd = false
-endif
+have_virtiofsd = get_option('virtiofsd') \
+ .require(targetos == 'linux',
+ error_message: 'virtiofsd requires Linux') \
+ .require(seccomp.found() and libcap_ng.found(),
+ error_message: 'virtiofsd requires libcap-ng-devel and seccomp-devel') \
+ .require('CONFIG_VHOST_USER' in config_host,
+ error_message: 'virtiofsd needs vhost-user-support') \
+ .disable_auto_if(not have_tools and not have_system) \
+ .allowed()
if have_virtiofsd
subdir('virtiofsd')
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 03/27] configure, meson: move AVX tests to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
2022-02-03 17:33 ` [PATCH 01/27] meson: use .allowed() method for features Paolo Bonzini
2022-02-03 17:33 ` [PATCH 02/27] meson: use .require() and .disable_auto_if() " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-04 4:07 ` Richard Henderson
2022-02-03 17:33 ` [PATCH 04/27] configure, meson: move membarrier test " Paolo Bonzini
` (23 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
For consistency with other tests, --enable-avx2 and --enable-avx512f
fail to compile on x86 systems if cpuid.h is not available.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 103 ----------------------------------
meson.build | 50 ++++++++++++++++-
meson_options.txt | 4 ++
scripts/meson-buildoptions.sh | 6 ++
4 files changed, 58 insertions(+), 105 deletions(-)
diff --git a/configure b/configure
index e6cfc0e4be..ebac59652b 100755
--- a/configure
+++ b/configure
@@ -323,8 +323,6 @@ qom_cast_debug="yes"
trace_backends="log"
trace_file="trace"
opengl="$default_feature"
-cpuid_h="no"
-avx2_opt="$default_feature"
guest_agent="$default_feature"
vss_win32_sdk="$default_feature"
win_sdk="no"
@@ -1033,14 +1031,6 @@ for opt do
;;
--disable-tools) want_tools="no"
;;
- --disable-avx2) avx2_opt="no"
- ;;
- --enable-avx2) avx2_opt="yes"
- ;;
- --disable-avx512f) avx512f_opt="no"
- ;;
- --enable-avx512f) avx512f_opt="yes"
- ;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
@@ -1420,8 +1410,6 @@ cat << EOF
coroutine-pool coroutine freelist (better performance)
tpm TPM support
numa libnuma support
- avx2 AVX2 optimization support
- avx512f AVX512F optimization support
replication replication support
opengl opengl support
qom-cast-debug cast debugging support
@@ -2761,85 +2749,6 @@ else # "$safe_stack" = ""
fi
fi
-########################################
-# check if cpuid.h is usable.
-
-cat > $TMPC << EOF
-#include <cpuid.h>
-int main(void) {
- unsigned a, b, c, d;
- int max = __get_cpuid_max(0, 0);
-
- if (max >= 1) {
- __cpuid(1, a, b, c, d);
- }
-
- if (max >= 7) {
- __cpuid_count(7, 0, a, b, c, d);
- }
-
- return 0;
-}
-EOF
-if compile_prog "" "" ; then
- cpuid_h=yes
-fi
-
-##########################################
-# avx2 optimization requirement check
-#
-# There is no point enabling this if cpuid.h is not usable,
-# since we won't be able to select the new routines.
-
-if test "$cpuid_h" = "yes" && test "$avx2_opt" != "no"; then
- cat > $TMPC << EOF
-#pragma GCC push_options
-#pragma GCC target("avx2")
-#include <cpuid.h>
-#include <immintrin.h>
-static int bar(void *a) {
- __m256i x = *(__m256i *)a;
- return _mm256_testz_si256(x, x);
-}
-int main(int argc, char *argv[]) { return bar(argv[0]); }
-EOF
- if compile_object "-Werror" ; then
- avx2_opt="yes"
- else
- avx2_opt="no"
- fi
-fi
-
-##########################################
-# avx512f optimization requirement check
-#
-# There is no point enabling this if cpuid.h is not usable,
-# since we won't be able to select the new routines.
-# by default, it is turned off.
-# if user explicitly want to enable it, check environment
-
-if test "$cpuid_h" = "yes" && test "$avx512f_opt" = "yes"; then
- cat > $TMPC << EOF
-#pragma GCC push_options
-#pragma GCC target("avx512f")
-#include <cpuid.h>
-#include <immintrin.h>
-static int bar(void *a) {
- __m512i x = *(__m512i *)a;
- return _mm512_test_epi64_mask(x, x);
-}
-int main(int argc, char *argv[])
-{
- return bar(argv[0]);
-}
-EOF
- if ! compile_object "-Werror" ; then
- avx512f_opt="no"
- fi
-else
- avx512f_opt="no"
-fi
-
########################################
# check if __[u]int128_t is usable.
@@ -3440,14 +3349,6 @@ if test "$opengl" = "yes" ; then
echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
fi
-if test "$avx2_opt" = "yes" ; then
- echo "CONFIG_AVX2_OPT=y" >> $config_host_mak
-fi
-
-if test "$avx512f_opt" = "yes" ; then
- echo "CONFIG_AVX512F_OPT=y" >> $config_host_mak
-fi
-
# XXX: suppress that
if [ "$bsd" = "yes" ] ; then
echo "CONFIG_BSD=y" >> $config_host_mak
@@ -3480,10 +3381,6 @@ if test "$have_tsan" = "yes" && test "$have_tsan_iface_fiber" = "yes" ; then
echo "CONFIG_TSAN=y" >> $config_host_mak
fi
-if test "$cpuid_h" = "yes" ; then
- echo "CONFIG_CPUID_H=y" >> $config_host_mak
-fi
-
if test "$int128" = "yes" ; then
echo "CONFIG_INT128=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 9ef0286f21..123121924e 100644
--- a/meson.build
+++ b/meson.build
@@ -1762,6 +1762,52 @@ config_host_data.set('CONFIG_GETAUXVAL', cc.links(gnu_source_prefix + '''
return getauxval(AT_HWCAP) == 0;
}'''))
+have_cpuid_h = cc.links('''
+ #include <cpuid.h>
+ int main(void) {
+ unsigned a, b, c, d;
+ int max = __get_cpuid_max(0, 0);
+
+ if (max >= 1) {
+ __cpuid(1, a, b, c, d);
+ }
+
+ if (max >= 7) {
+ __cpuid_count(7, 0, a, b, c, d);
+ }
+
+ return 0;
+ }''')
+config_host_data.set('CONFIG_CPUID_H', have_cpuid_h)
+
+config_host_data.set('CONFIG_AVX2_OPT', get_option('avx2') \
+ .require(have_cpuid_h, error_message: 'cpuid.h not available, cannot enable AVX2') \
+ .require(cc.links('''
+ #pragma GCC push_options
+ #pragma GCC target("avx2")
+ #include <cpuid.h>
+ #include <immintrin.h>
+ static int bar(void *a) {
+ __m256i x = *(__m256i *)a;
+ return _mm256_testz_si256(x, x);
+ }
+ int main(int argc, char *argv[]) { return bar(argv[0]); }
+ '''), error_message: 'AVX2 not available').allowed())
+
+config_host_data.set('CONFIG_AVX512F_OPT', get_option('avx512f') \
+ .require(have_cpuid_h, error_message: 'cpuid.h not available, cannot enable AVX512F') \
+ .require(cc.links('''
+ #pragma GCC push_options
+ #pragma GCC target("avx512f")
+ #include <cpuid.h>
+ #include <immintrin.h>
+ static int bar(void *a) {
+ __m512i x = *(__m512i *)a;
+ return _mm512_test_epi64_mask(x, x);
+ }
+ int main(int argc, char *argv[]) { return bar(argv[0]); }
+ '''), error_message: 'AVX512F not available').allowed())
+
config_host_data.set('CONFIG_AF_VSOCK', cc.compiles(gnu_source_prefix + '''
#include <errno.h>
#include <sys/types.h>
@@ -3293,8 +3339,8 @@ summary_info += {'membarrier': config_host.has_key('CONFIG_MEMBARRIER')}
summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
summary_info += {'memory allocator': get_option('malloc')}
-summary_info += {'avx2 optimization': config_host.has_key('CONFIG_AVX2_OPT')}
-summary_info += {'avx512f optimization': config_host.has_key('CONFIG_AVX512F_OPT')}
+summary_info += {'avx2 optimization': config_host_data.get('CONFIG_AVX2_OPT')}
+summary_info += {'avx512f optimization': config_host_data.get('CONFIG_AVX512F_OPT')}
summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')}
summary_info += {'gcov': get_option('b_coverage')}
summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
diff --git a/meson_options.txt b/meson_options.txt
index 95d527f773..6ff349023c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -68,6 +68,10 @@ option('multiprocess', type: 'feature', value: 'auto',
description: 'Out of process device emulation support')
option('dbus_display', type: 'feature', value: 'auto',
description: '-display dbus support')
+option('avx2', type: 'feature', value: 'auto',
+ description: 'AVX2 optimizations')
+option('avx512f', type: 'feature', value: 'disabled',
+ description: 'AVX512F optimizations')
option('attr', type : 'feature', value : 'auto',
description: 'attr/xattr support')
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index a4af02c527..a5cbe0ea00 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -26,6 +26,8 @@ meson_options_help() {
printf "%s\n" ' alsa ALSA sound support'
printf "%s\n" ' attr attr/xattr support'
printf "%s\n" ' auth-pam PAM access control'
+ printf "%s\n" ' avx2 AVX2 optimizations'
+ printf "%s\n" ' avx512f AVX512F optimizations'
printf "%s\n" ' bpf eBPF support'
printf "%s\n" ' brlapi brlapi character device driver'
printf "%s\n" ' bzip2 bzip2 support for DMG images'
@@ -110,6 +112,10 @@ _meson_option_parse() {
--disable-attr) printf "%s" -Dattr=disabled ;;
--enable-auth-pam) printf "%s" -Dauth_pam=enabled ;;
--disable-auth-pam) printf "%s" -Dauth_pam=disabled ;;
+ --enable-avx2) printf "%s" -Davx2=enabled ;;
+ --disable-avx2) printf "%s" -Davx2=disabled ;;
+ --enable-avx512f) printf "%s" -Davx512f=enabled ;;
+ --disable-avx512f) printf "%s" -Davx512f=disabled ;;
--enable-bpf) printf "%s" -Dbpf=enabled ;;
--disable-bpf) printf "%s" -Dbpf=disabled ;;
--enable-brlapi) printf "%s" -Dbrlapi=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 03/27] configure, meson: move AVX tests to meson
2022-02-03 17:33 ` [PATCH 03/27] configure, meson: move AVX tests to meson Paolo Bonzini
@ 2022-02-04 4:07 ` Richard Henderson
0 siblings, 0 replies; 46+ messages in thread
From: Richard Henderson @ 2022-02-04 4:07 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: marcandre.lureau
On 2/4/22 04:33, Paolo Bonzini wrote:
> For consistency with other tests, --enable-avx2 and --enable-avx512f
> fail to compile on x86 systems if cpuid.h is not available.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 103 ----------------------------------
> meson.build | 50 ++++++++++++++++-
> meson_options.txt | 4 ++
> scripts/meson-buildoptions.sh | 6 ++
> 4 files changed, 58 insertions(+), 105 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 04/27] configure, meson: move membarrier test to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (2 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 03/27] configure, meson: move AVX tests to meson Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 05/27] configure, meson: move AF_ALG " Paolo Bonzini
` (22 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
The test is a bit different from the others, in that it does not run
if $membarrier is empty. For meson, the default can simply be disabled;
if one day we will toggle the default, no change is needed in meson.build.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 40 -----------------------------------
meson.build | 22 ++++++++++++++++++-
meson_options.txt | 6 ++++++
scripts/meson-buildoptions.sh | 3 +++
util/meson.build | 4 +++-
5 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/configure b/configure
index ebac59652b..9dc0d79b0e 100755
--- a/configure
+++ b/configure
@@ -290,7 +290,6 @@ EXTRA_CXXFLAGS=""
EXTRA_LDFLAGS=""
xen_ctrl_version="$default_feature"
-membarrier="$default_feature"
vhost_kernel="$default_feature"
vhost_net="$default_feature"
vhost_crypto="$default_feature"
@@ -967,10 +966,6 @@ for opt do
;;
--enable-fdt=*) fdt="$optarg"
;;
- --disable-membarrier) membarrier="no"
- ;;
- --enable-membarrier) membarrier="yes"
- ;;
--with-pkgversion=*) pkgversion="$optarg"
;;
--with-coroutine=*) coroutine="$optarg"
@@ -1396,7 +1391,6 @@ cat << EOF
lto Enable Link-Time Optimization.
safe-stack SafeStack Stack Smash Protection. Depends on
clang/llvm >= 3.7 and requires coroutine backend ucontext.
- membarrier membarrier system call (for Linux 4.14+ or Windows)
rdma Enable RDMA-based migration
pvrdma Enable PVRDMA support
vhost-net vhost-net kernel acceleration support
@@ -2844,37 +2838,6 @@ if test "$fortify_source" != "no"; then
fi
fi
-##########################################
-# check for usable membarrier system call
-if test "$membarrier" = "yes"; then
- have_membarrier=no
- if test "$mingw32" = "yes" ; then
- have_membarrier=yes
- elif test "$linux" = "yes" ; then
- cat > $TMPC << EOF
- #include <linux/membarrier.h>
- #include <sys/syscall.h>
- #include <unistd.h>
- #include <stdlib.h>
- int main(void) {
- syscall(__NR_membarrier, MEMBARRIER_CMD_QUERY, 0);
- syscall(__NR_membarrier, MEMBARRIER_CMD_SHARED, 0);
- exit(0);
- }
-EOF
- if compile_prog "" "" ; then
- have_membarrier=yes
- fi
- fi
- if test "$have_membarrier" = "no"; then
- feature_not_found "membarrier" "membarrier system call not available"
- fi
-else
- # Do not enable it by default even for Mingw32, because it doesn't
- # work on Wine.
- membarrier=no
-fi
-
##########################################
# check for usable AF_ALG environment
have_afalg=no
@@ -3336,9 +3299,6 @@ fi
if test "$vhost_user_fs" = "yes" ; then
echo "CONFIG_VHOST_USER_FS=y" >> $config_host_mak
fi
-if test "$membarrier" = "yes" ; then
- echo "CONFIG_MEMBARRIER=y" >> $config_host_mak
-fi
if test "$tcg" = "enabled" -a "$tcg_interpreter" = "true" ; then
echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 123121924e..16f7563360 100644
--- a/meson.build
+++ b/meson.build
@@ -1808,6 +1808,26 @@ config_host_data.set('CONFIG_AVX512F_OPT', get_option('avx512f') \
int main(int argc, char *argv[]) { return bar(argv[0]); }
'''), error_message: 'AVX512F not available').allowed())
+if get_option('membarrier').disabled()
+ have_membarrier = false
+elif targetos == 'windows'
+ have_membarrier = true
+elif targetos == 'linux'
+ have_membarrier = cc.compiles('''
+ #include <linux/membarrier.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ int main(void) {
+ syscall(__NR_membarrier, MEMBARRIER_CMD_QUERY, 0);
+ syscall(__NR_membarrier, MEMBARRIER_CMD_SHARED, 0);
+ exit(0);
+ }''')
+endif
+config_host_data.set('CONFIG_MEMBARRIER', get_option('membarrier') \
+ .require(have_membarrier, error_message: 'membarrier system call not available') \
+ .allowed())
+
config_host_data.set('CONFIG_AF_VSOCK', cc.compiles(gnu_source_prefix + '''
#include <errno.h>
#include <sys/types.h>
@@ -3335,7 +3355,7 @@ summary_info += {'link-time optimization (LTO)': get_option('b_lto')}
summary_info += {'PIE': get_option('b_pie')}
summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
summary_info += {'malloc trim support': has_malloc_trim}
-summary_info += {'membarrier': config_host.has_key('CONFIG_MEMBARRIER')}
+summary_info += {'membarrier': have_membarrier}
summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
summary_info += {'memory allocator': get_option('malloc')}
diff --git a/meson_options.txt b/meson_options.txt
index 6ff349023c..49f14f960e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -68,6 +68,12 @@ option('multiprocess', type: 'feature', value: 'auto',
description: 'Out of process device emulation support')
option('dbus_display', type: 'feature', value: 'auto',
description: '-display dbus support')
+
+# Do not enable it by default even for Mingw32, because it doesn't
+# work on Wine.
+option('membarrier', type: 'feature', value: 'disabled',
+ description: 'membarrier system call (for Linux 4.14+ or Windows')
+
option('avx2', type: 'feature', value: 'auto',
description: 'AVX2 optimizations')
option('avx512f', type: 'feature', value: 'disabled',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index a5cbe0ea00..61716e827c 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -66,6 +66,7 @@ meson_options_help() {
printf "%s\n" ' lzfse lzfse support for DMG images'
printf "%s\n" ' lzo lzo compression support'
printf "%s\n" ' malloc-trim enable libc malloc_trim() for memory optimization'
+ printf "%s\n" ' membarrier membarrier system call (for Linux 4.14+ or Windows'
printf "%s\n" ' mpath Multipath persistent reservation passthrough'
printf "%s\n" ' multiprocess Out of process device emulation support'
printf "%s\n" ' netmap netmap network backend support'
@@ -207,6 +208,8 @@ _meson_option_parse() {
--enable-malloc=*) quote_sh "-Dmalloc=$2" ;;
--enable-malloc-trim) printf "%s" -Dmalloc_trim=enabled ;;
--disable-malloc-trim) printf "%s" -Dmalloc_trim=disabled ;;
+ --enable-membarrier) printf "%s" -Dmembarrier=enabled ;;
+ --disable-membarrier) printf "%s" -Dmembarrier=disabled ;;
--enable-mpath) printf "%s" -Dmpath=enabled ;;
--disable-mpath) printf "%s" -Dmpath=disabled ;;
--enable-multiprocess) printf "%s" -Dmultiprocess=enabled ;;
diff --git a/util/meson.build b/util/meson.build
index c9a9cc1cf5..3736988b9f 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -35,7 +35,9 @@ util_ss.add(files('crc32c.c'))
util_ss.add(files('uuid.c'))
util_ss.add(files('getauxval.c'))
util_ss.add(files('rcu.c'))
-util_ss.add(when: 'CONFIG_MEMBARRIER', if_true: files('sys_membarrier.c'))
+if have_membarrier
+ util_ss.add(files('sys_membarrier.c'))
+endif
util_ss.add(files('log.c'))
util_ss.add(files('pagesize.c'))
util_ss.add(files('qdist.c'))
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 05/27] configure, meson: move AF_ALG test to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (3 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 04/27] configure, meson: move membarrier test " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 06/27] configure, meson: move libnuma detection " Paolo Bonzini
` (21 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 36 -----------------------------------
crypto/meson.build | 4 +++-
meson.build | 16 +++++++++++++++-
meson_options.txt | 2 ++
scripts/meson-buildoptions.sh | 3 +++
5 files changed, 23 insertions(+), 38 deletions(-)
diff --git a/configure b/configure
index 9dc0d79b0e..cdaab251c8 100755
--- a/configure
+++ b/configure
@@ -329,7 +329,6 @@ want_tools="$default_feature"
coroutine=""
coroutine_pool="$default_feature"
debug_stack_usage="no"
-crypto_afalg="no"
tls_priority="NORMAL"
tpm="$default_feature"
live_block_migration=${default_feature:-yes}
@@ -976,10 +975,6 @@ for opt do
;;
--enable-debug-stack-usage) debug_stack_usage="yes"
;;
- --enable-crypto-afalg) crypto_afalg="yes"
- ;;
- --disable-crypto-afalg) crypto_afalg="no"
- ;;
--disable-vhost-net) vhost_net="no"
;;
--enable-vhost-net) vhost_net="yes"
@@ -1416,7 +1411,6 @@ cat << EOF
vvfat vvfat image format support
qed qed image format support
parallels parallels image format support
- crypto-afalg Linux AF_ALG crypto backend driver
debug-mutex mutex debugging support
rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
gio libgio support
@@ -2838,32 +2832,6 @@ if test "$fortify_source" != "no"; then
fi
fi
-##########################################
-# check for usable AF_ALG environment
-have_afalg=no
-cat > $TMPC << EOF
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <linux/if_alg.h>
-int main(void) {
- int sock;
- sock = socket(AF_ALG, SOCK_SEQPACKET, 0);
- return sock;
-}
-EOF
-if compile_prog "" "" ; then
- have_afalg=yes
-fi
-if test "$crypto_afalg" = "yes"
-then
- if test "$have_afalg" != "yes"
- then
- error_exit "AF_ALG requested but could not be detected"
- fi
-fi
-
-
##########################################
# checks for sanitizers
@@ -3329,10 +3297,6 @@ if test "$debug_stack_usage" = "yes" ; then
echo "CONFIG_DEBUG_STACK_USAGE=y" >> $config_host_mak
fi
-if test "$crypto_afalg" = "yes" ; then
- echo "CONFIG_AF_ALG=y" >> $config_host_mak
-fi
-
if test "$have_asan_iface_fiber" = "yes" ; then
echo "CONFIG_ASAN_IFACE_FIBER=y" >> $config_host_mak
fi
diff --git a/crypto/meson.build b/crypto/meson.build
index 95a6a83504..9bf3a431fe 100644
--- a/crypto/meson.build
+++ b/crypto/meson.build
@@ -35,7 +35,9 @@ else
endif
crypto_ss.add(when: 'CONFIG_SECRET_KEYRING', if_true: files('secret_keyring.c'))
-crypto_ss.add(when: 'CONFIG_AF_ALG', if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c'))
+if have_afalg
+ crypto_ss.add(if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c'))
+endif
crypto_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c'))
util_ss.add(files('aes.c'))
diff --git a/meson.build b/meson.build
index 16f7563360..1d4ba12f52 100644
--- a/meson.build
+++ b/meson.build
@@ -1828,6 +1828,20 @@ config_host_data.set('CONFIG_MEMBARRIER', get_option('membarrier') \
.require(have_membarrier, error_message: 'membarrier system call not available') \
.allowed())
+have_afalg = get_option('crypto_afalg') \
+ .require(cc.compiles(gnu_source_prefix + '''
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <linux/if_alg.h>
+ int main(void) {
+ int sock;
+ sock = socket(AF_ALG, SOCK_SEQPACKET, 0);
+ return sock;
+ }
+ '''), error_message: 'AF_ALG requested but could not be detected').allowed()
+config_host_data.set('CONFIG_AF_ALG', have_afalg)
+
config_host_data.set('CONFIG_AF_VSOCK', cc.compiles(gnu_source_prefix + '''
#include <errno.h>
#include <sys/types.h>
@@ -3457,7 +3471,7 @@ summary_info += {'nettle': nettle}
if nettle.found()
summary_info += {' XTS': xts != 'private'}
endif
-summary_info += {'crypto afalg': config_host.has_key('CONFIG_AF_ALG')}
+summary_info += {'AF_ALG support': have_afalg}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary(summary_info, bool_yn: true, section: 'Crypto')
diff --git a/meson_options.txt b/meson_options.txt
index 49f14f960e..6efad01528 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -113,6 +113,8 @@ option('nettle', type : 'feature', value : 'auto',
description: 'nettle cryptography support')
option('gcrypt', type : 'feature', value : 'auto',
description: 'libgcrypt cryptography support')
+option('crypto_afalg', type : 'feature', value : 'auto',
+ description: 'Linux AF_ALG crypto backend driver')
option('libdaxctl', type : 'feature', value : 'auto',
description: 'libdaxctl support')
option('libpmem', type : 'feature', value : 'auto',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 61716e827c..c558fe6761 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -34,6 +34,7 @@ meson_options_help() {
printf "%s\n" ' cap-ng cap_ng support'
printf "%s\n" ' cocoa Cocoa user interface (macOS only)'
printf "%s\n" ' coreaudio CoreAudio sound support'
+ printf "%s\n" ' crypto-afalg Linux AF_ALG crypto backend driver'
printf "%s\n" ' curl CURL block device driver'
printf "%s\n" ' curses curses UI'
printf "%s\n" ' dbus-display -display dbus support'
@@ -136,6 +137,8 @@ _meson_option_parse() {
--disable-cocoa) printf "%s" -Dcocoa=disabled ;;
--enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
--disable-coreaudio) printf "%s" -Dcoreaudio=disabled ;;
+ --enable-crypto-afalg) printf "%s" -Dcrypto_afalg=enabled ;;
+ --disable-crypto-afalg) printf "%s" -Dcrypto_afalg=disabled ;;
--enable-curl) printf "%s" -Dcurl=enabled ;;
--disable-curl) printf "%s" -Dcurl=disabled ;;
--enable-curses) printf "%s" -Dcurses=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 06/27] configure, meson: move libnuma detection to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (4 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 05/27] configure, meson: move AF_ALG " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 07/27] configure, meson: move TPM check " Paolo Bonzini
` (20 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 31 -------------------------------
meson.build | 25 ++++++++++++++++++++-----
meson_options.txt | 2 ++
scripts/meson-buildoptions.sh | 3 +++
4 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/configure b/configure
index cdaab251c8..afb6e8744a 100755
--- a/configure
+++ b/configure
@@ -332,7 +332,6 @@ debug_stack_usage="no"
tls_priority="NORMAL"
tpm="$default_feature"
live_block_migration=${default_feature:-yes}
-numa="$default_feature"
replication=${default_feature:-yes}
bochs=${default_feature:-yes}
cloop=${default_feature:-yes}
@@ -1048,10 +1047,6 @@ for opt do
;;
--enable-live-block-migration) live_block_migration="yes"
;;
- --disable-numa) numa="no"
- ;;
- --enable-numa) numa="yes"
- ;;
--disable-replication) replication="no"
;;
--enable-replication) replication="yes"
@@ -1398,7 +1393,6 @@ cat << EOF
live-block-migration Block migration in the main migration stream
coroutine-pool coroutine freelist (better performance)
tpm TPM support
- numa libnuma support
replication replication support
opengl opengl support
qom-cast-debug cast debugging support
@@ -2476,26 +2470,6 @@ EOF
fi
fi
-##########################################
-# libnuma probe
-
-if test "$numa" != "no" ; then
- cat > $TMPC << EOF
-#include <numa.h>
-int main(void) { return numa_available(); }
-EOF
-
- if compile_prog "" "-lnuma" ; then
- numa=yes
- numa_libs="-lnuma"
- else
- if test "$numa" = "yes" ; then
- feature_not_found "numa" "install numactl devel"
- fi
- numa=no
- fi
-fi
-
# check for usbfs
have_usbfs=no
if test "$linux_user" = "yes"; then
@@ -3463,11 +3437,6 @@ if test "$default_targets" = "yes"; then
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
fi
-if test "$numa" = "yes"; then
- echo "CONFIG_NUMA=y" >> $config_host_mak
- echo "NUMA_LIBS=$numa_libs" >> $config_host_mak
-fi
-
if test "$ccache_cpp2" = "yes"; then
echo "export CCACHE_CPP2=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 1d4ba12f52..cfb02f31ca 100644
--- a/meson.build
+++ b/meson.build
@@ -1164,14 +1164,28 @@ if lzo.found() and not cc.links('''
endif
endif
+numa = not_found
+if not get_option('numa').auto() or have_system or have_tools
+ numa = cc.find_library('numa', has_headers: ['numa.h'],
+ required: get_option('numa'),
+ kwargs: static_kwargs)
+endif
+if numa.found() and not cc.links('''
+ #include <numa.h>
+ int main(void) { return numa_available(); }
+ ''', dependencies: numa)
+ numa = not_found
+ if get_option('numa').enabled()
+ error('could not link numa')
+ else
+ warning('could not link numa, disabling')
+ endif
+endif
+
rdma = not_found
if 'CONFIG_RDMA' in config_host
rdma = declare_dependency(link_args: config_host['RDMA_LIBS'].split())
endif
-numa = not_found
-if 'CONFIG_NUMA' in config_host
- numa = declare_dependency(link_args: config_host['NUMA_LIBS'].split())
-endif
xen = not_found
if 'CONFIG_XEN_BACKEND' in config_host
xen = declare_dependency(compile_args: config_host['XEN_CFLAGS'].split(),
@@ -1472,6 +1486,7 @@ config_host_data.set('CONFIG_LIBSSH', libssh.found())
config_host_data.set('CONFIG_LINUX_AIO', libaio.found())
config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
+config_host_data.set('CONFIG_NUMA', numa.found())
config_host_data.set('CONFIG_RBD', rbd.found())
config_host_data.set('CONFIG_SDL', sdl.found())
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
@@ -3552,7 +3567,7 @@ summary_info += {'snappy support': snappy}
summary_info += {'bzip2 support': libbzip2}
summary_info += {'lzfse support': liblzfse}
summary_info += {'zstd support': zstd}
-summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
+summary_info += {'NUMA host support': numa}
summary_info += {'capstone': capstone_opt == 'internal' ? capstone_opt : capstone}
summary_info += {'libpmem support': libpmem}
summary_info += {'libdaxctl support': libdaxctl}
diff --git a/meson_options.txt b/meson_options.txt
index 6efad01528..bb443023b5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -103,6 +103,8 @@ option('libnfs', type : 'feature', value : 'auto',
description: 'libnfs block device driver')
option('mpath', type : 'feature', value : 'auto',
description: 'Multipath persistent reservation passthrough')
+option('numa', type : 'feature', value : 'auto',
+ description: 'libnuma support')
option('iconv', type : 'feature', value : 'auto',
description: 'Font glyph conversion support')
option('curses', type : 'feature', value : 'auto',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index c558fe6761..855c8df754 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -72,6 +72,7 @@ meson_options_help() {
printf "%s\n" ' multiprocess Out of process device emulation support'
printf "%s\n" ' netmap netmap network backend support'
printf "%s\n" ' nettle nettle cryptography support'
+ printf "%s\n" ' numa libnuma support'
printf "%s\n" ' nvmm NVMM acceleration support'
printf "%s\n" ' oss OSS sound support'
printf "%s\n" ' pa PulseAudio sound support'
@@ -221,6 +222,8 @@ _meson_option_parse() {
--disable-netmap) printf "%s" -Dnetmap=disabled ;;
--enable-nettle) printf "%s" -Dnettle=enabled ;;
--disable-nettle) printf "%s" -Dnettle=disabled ;;
+ --enable-numa) printf "%s" -Dnuma=enabled ;;
+ --disable-numa) printf "%s" -Dnuma=disabled ;;
--enable-nvmm) printf "%s" -Dnvmm=enabled ;;
--disable-nvmm) printf "%s" -Dnvmm=disabled ;;
--enable-oss) printf "%s" -Doss=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 07/27] configure, meson: move TPM check to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (5 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 06/27] configure, meson: move libnuma detection " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 08/27] configure, meson: cleanup qemu-ga libraries Paolo Bonzini
` (19 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
The check is simply for a POSIX system.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
backends/tpm/meson.build | 14 ++++++--------
configure | 25 -------------------------
docs/devel/kconfig.rst | 2 +-
hw/acpi/meson.build | 4 +++-
meson.build | 9 +++++++--
meson_options.txt | 2 ++
scripts/meson-buildoptions.sh | 3 +++
softmmu/meson.build | 5 ++++-
8 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/backends/tpm/meson.build b/backends/tpm/meson.build
index 857929082e..7f2503f84e 100644
--- a/backends/tpm/meson.build
+++ b/backends/tpm/meson.build
@@ -1,8 +1,6 @@
-tpm_ss = ss.source_set()
-
-tpm_ss.add(files('tpm_backend.c'))
-tpm_ss.add(files('tpm_util.c'))
-tpm_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
-tpm_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
-
-softmmu_ss.add_all(when: 'CONFIG_TPM', if_true: tpm_ss)
+if have_tpm
+ softmmu_ss.add(files('tpm_backend.c'))
+ softmmu_ss.add(files('tpm_util.c'))
+ softmmu_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough.c'))
+ softmmu_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c'))
+endif
diff --git a/configure b/configure
index afb6e8744a..10cff5df1f 100755
--- a/configure
+++ b/configure
@@ -330,7 +330,6 @@ coroutine=""
coroutine_pool="$default_feature"
debug_stack_usage="no"
tls_priority="NORMAL"
-tpm="$default_feature"
live_block_migration=${default_feature:-yes}
replication=${default_feature:-yes}
bochs=${default_feature:-yes}
@@ -1039,10 +1038,6 @@ for opt do
;;
--disable-pvrdma) pvrdma="no"
;;
- --disable-tpm) tpm="no"
- ;;
- --enable-tpm) tpm="yes"
- ;;
--disable-live-block-migration) live_block_migration="no"
;;
--enable-live-block-migration) live_block_migration="yes"
@@ -1392,7 +1387,6 @@ cat << EOF
vhost-vdpa vhost-vdpa kernel backend support
live-block-migration Block migration in the main migration stream
coroutine-pool coroutine freelist (better performance)
- tpm TPM support
replication replication support
opengl opengl support
qom-cast-debug cast debugging support
@@ -2416,21 +2410,6 @@ if test "$modules" = yes; then
fi
fi
-##########################################
-# TPM emulation is only on POSIX
-
-if test "$tpm" = ""; then
- if test "$mingw32" = "yes"; then
- tpm=no
- else
- tpm=yes
- fi
-elif test "$tpm" = "yes"; then
- if test "$mingw32" = "yes" ; then
- error_exit "TPM emulation only available on POSIX systems"
- fi
-fi
-
##########################################
# fdt probe
@@ -3295,10 +3274,6 @@ if test "$live_block_migration" = "yes" ; then
echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
fi
-if test "$tpm" = "yes"; then
- echo 'CONFIG_TPM=y' >> $config_host_mak
-fi
-
if test "$rdma" = "yes" ; then
echo "CONFIG_RDMA=y" >> $config_host_mak
echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst
index a1cdbec751..d6b55a6fe0 100644
--- a/docs/devel/kconfig.rst
+++ b/docs/devel/kconfig.rst
@@ -301,7 +301,7 @@ and also listed as follows in the top-level meson.build's host_kconfig
variable::
host_kconfig = \
- ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
+ (have_tpm ? ['CONFIG_TPM=y'] : []) + \
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
...
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index adf6347bc4..e805ecc937 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -24,7 +24,9 @@ acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c'))
acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c'))
acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
-acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
+if have_tpm
+ acpi_ss.add(files('tpm.c'))
+endif
softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c'))
softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c',
diff --git a/meson.build b/meson.build
index cfb02f31ca..9584587462 100644
--- a/meson.build
+++ b/meson.build
@@ -276,6 +276,10 @@ multiprocess_allowed = get_option('multiprocess') \
.require(targetos == 'linux', error_message: 'Multiprocess QEMU is supported only on Linux') \
.allowed()
+have_tpm = get_option('tpm') \
+ .require(targetos != 'windows', error_message: 'TPM emulation only available on POSIX systems') \
+ .allowed()
+
# Target-specific libraries and flags
libm = cc.find_library('m', required: false)
threads = dependency('threads')
@@ -1492,6 +1496,7 @@ config_host_data.set('CONFIG_SDL', sdl.found())
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
config_host_data.set('CONFIG_SECCOMP', seccomp.found())
config_host_data.set('CONFIG_SNAPPY', snappy.found())
+config_host_data.set('CONFIG_TPM', have_tpm)
config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
config_host_data.set('CONFIG_VDE', vde.found())
config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server)
@@ -1942,7 +1947,7 @@ endif
have_ivshmem = config_host_data.get('CONFIG_EVENTFD')
host_kconfig = \
(get_option('fuzzing') ? ['CONFIG_FUZZ=y'] : []) + \
- ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
+ (have_tpm ? ['CONFIG_TPM=y'] : []) + \
(spice.found() ? ['CONFIG_SPICE=y'] : []) + \
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \
@@ -3560,7 +3565,7 @@ if targetos == 'windows'
endif
summary_info += {'seccomp support': seccomp}
summary_info += {'GlusterFS support': glusterfs}
-summary_info += {'TPM support': config_host.has_key('CONFIG_TPM')}
+summary_info += {'TPM support': have_tpm}
summary_info += {'libssh support': libssh}
summary_info += {'lzo support': lzo}
summary_info += {'snappy support': snappy}
diff --git a/meson_options.txt b/meson_options.txt
index bb443023b5..1b44b4e666 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -68,6 +68,8 @@ option('multiprocess', type: 'feature', value: 'auto',
description: 'Out of process device emulation support')
option('dbus_display', type: 'feature', value: 'auto',
description: '-display dbus support')
+option('tpm', type : 'feature', value : 'auto',
+ description: 'TPM support')
# Do not enable it by default even for Mingw32, because it doesn't
# work on Wine.
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 855c8df754..e040fa1501 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -87,6 +87,7 @@ meson_options_help() {
printf "%s\n" ' spice Spice server support'
printf "%s\n" ' spice-protocol Spice protocol support'
printf "%s\n" ' tcg TCG support'
+ printf "%s\n" ' tpm TPM support'
printf "%s\n" ' u2f U2F emulation support'
printf "%s\n" ' usb-redir libusbredir support'
printf "%s\n" ' vde vde network backend support'
@@ -259,6 +260,8 @@ _meson_option_parse() {
--disable-tcg) printf "%s" -Dtcg=disabled ;;
--enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=true ;;
--disable-tcg-interpreter) printf "%s" -Dtcg_interpreter=false ;;
+ --enable-tpm) printf "%s" -Dtpm=enabled ;;
+ --disable-tpm) printf "%s" -Dtpm=disabled ;;
--enable-trace-backends=*) quote_sh "-Dtrace_backends=$2" ;;
--enable-u2f) printf "%s" -Du2f=enabled ;;
--disable-u2f) printf "%s" -Du2f=disabled ;;
diff --git a/softmmu/meson.build b/softmmu/meson.build
index d8e03018ab..39f766ce7c 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -27,6 +27,9 @@ softmmu_ss.add(files(
'qdev-monitor.c',
), sdl, libpmem, libdaxctl)
-softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
+if have_tpm
+ softmmu_ss.add(files('tpm.c'))
+endif
+
softmmu_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
softmmu_ss.add(when: fdt, if_true: files('device_tree.c'))
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 08/27] configure, meson: cleanup qemu-ga libraries
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (6 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 07/27] configure, meson: move TPM check " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 09/27] configure, meson: move image format options to meson_options.txt Paolo Bonzini
` (18 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Move LIBS_QGA to meson.build, remove dead QGA_VSS_PROVIDER variable.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 7 -------
qga/meson.build | 25 +++++++++++++++++--------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/configure b/configure
index 10cff5df1f..5bb23dadc1 100755
--- a/configure
+++ b/configure
@@ -240,7 +240,6 @@ block_drv_rw_whitelist=""
block_drv_ro_whitelist=""
block_drv_whitelist_tools="no"
host_cc="cc"
-libs_qga=""
debug_info="yes"
lto="false"
stack_protector=""
@@ -708,7 +707,6 @@ if test "$mingw32" = "yes" ; then
write_c_skeleton;
prefix="/qemu"
qemu_suffix=""
- libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga"
fi
werror=""
@@ -2496,8 +2494,6 @@ EOF
if compile_prog "$vss_win32_include" "" ; then
guest_agent_with_vss="yes"
QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
- libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
- qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
else
if test "$vss_win32_sdk" != "" ; then
echo "ERROR: Please download and install Microsoft VSS SDK:"
@@ -2548,7 +2544,6 @@ int main(void) {
EOF
if compile_prog "" "" ; then
guest_agent_ntddscsi=yes
- libs_qga="-lsetupapi -lcfgmgr32 $libs_qga"
fi
fi
@@ -3106,7 +3101,6 @@ if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
if test "$guest_agent_with_vss" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak
- echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak
echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
fi
if test "$guest_agent_ntddscsi" = "yes" ; then
@@ -3358,7 +3352,6 @@ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
echo "STRIP=$strip" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
-echo "LIBS_QGA=$libs_qga" >> $config_host_mak
if test "$rng_none" = "yes"; then
echo "CONFIG_RNG_NONE=y" >> $config_host_mak
diff --git a/qga/meson.build b/qga/meson.build
index 1ee9dca60b..56fb6539e5 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -1,3 +1,5 @@
+all_qga = []
+
qga_qapi_outputs = [
'qga-qapi-commands.c',
'qga-qapi-commands.h',
@@ -50,19 +52,26 @@ qga_ss.add(when: 'CONFIG_WIN32', if_true: files(
qga_ss = qga_ss.apply(config_host, strict: false)
+gen_tlb = []
+qga_libs = []
+if targetos == 'windows'
+ qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32']
+ if 'CONFIG_QGA_VSS' in config_host
+ qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup']
+ subdir('vss-win32')
+ endif
+ if 'CONFIG_QGA_NTDDSCSI' in config_host
+ qga_libs += ['-lsetupapi', '-lcfgmgr32']
+ endif
+endif
+
qga = executable('qemu-ga', qga_ss.sources(),
- link_args: config_host['LIBS_QGA'].split(),
+ link_args: qga_libs,
dependencies: [qemuutil, libudev],
install: true)
-all_qga = [qga]
+all_qga += qga
if targetos == 'windows'
- if 'CONFIG_QGA_VSS' in config_host
- subdir('vss-win32')
- else
- gen_tlb = []
- endif
-
qemu_ga_msi_arch = {
'x86': ['-D', 'Arch=32'],
'x86_64': ['-a', 'x64', '-D', 'Arch=64']
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 09/27] configure, meson: move image format options to meson_options.txt
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (7 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 08/27] configure, meson: cleanup qemu-ga libraries Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 10/27] configure, meson: move block layer " Paolo Bonzini
` (17 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/meson.build | 47 +++++++++++++++-------
configure | 73 -----------------------------------
meson.build | 16 ++++----
meson_options.txt | 16 ++++++++
scripts/meson-buildoptions.sh | 24 ++++++++++++
5 files changed, 80 insertions(+), 96 deletions(-)
diff --git a/block/meson.build b/block/meson.build
index 90dc9983e5..4afde2ebf8 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -45,20 +45,37 @@ block_ss.add(files(
softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
-block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c'))
-block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c'))
-block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c'))
-block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c'))
-block_ss.add(when: 'CONFIG_VVFAT', if_true: files('vvfat.c'))
-block_ss.add(when: 'CONFIG_DMG', if_true: files('dmg.c'))
-block_ss.add(when: 'CONFIG_QED', if_true: files(
- 'qed-check.c',
- 'qed-cluster.c',
- 'qed-l2-cache.c',
- 'qed-table.c',
- 'qed.c',
-))
-block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'parallels-ext.c'))
+if get_option('qcow1').allowed()
+ block_ss.add(files('qcow.c'))
+endif
+if get_option('vdi').allowed()
+ block_ss.add(files('vdi.c'))
+endif
+if get_option('cloop').allowed()
+ block_ss.add(files('cloop.c'))
+endif
+if get_option('bochs').allowed()
+ block_ss.add(files('bochs.c'))
+endif
+if get_option('vvfat').allowed()
+ block_ss.add(files('vvfat.c'))
+endif
+if get_option('dmg').allowed()
+ block_ss.add(files('dmg.c'))
+endif
+if get_option('qed').allowed()
+ block_ss.add(files(
+ 'qed-check.c',
+ 'qed-cluster.c',
+ 'qed-l2-cache.c',
+ 'qed-table.c',
+ 'qed.c',
+ ))
+endif
+if get_option('parallels').allowed()
+ block_ss.add(files('parallels.c', 'parallels-ext.c'))
+endif
+
block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c'))
block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit])
block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c'))
@@ -89,7 +106,7 @@ foreach m : [
endforeach
# those are not exactly regular block modules, so treat them apart
-if 'CONFIG_DMG' in config_host
+if get_option('dmg').allowed()
foreach m : [
[liblzfse, 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'],
[libbzip2, 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c']
diff --git a/configure b/configure
index 5bb23dadc1..acee571fbc 100755
--- a/configure
+++ b/configure
@@ -331,14 +331,6 @@ debug_stack_usage="no"
tls_priority="NORMAL"
live_block_migration=${default_feature:-yes}
replication=${default_feature:-yes}
-bochs=${default_feature:-yes}
-cloop=${default_feature:-yes}
-dmg=${default_feature:-yes}
-qcow1=${default_feature:-yes}
-vdi=${default_feature:-yes}
-vvfat=${default_feature:-yes}
-qed=${default_feature:-yes}
-parallels=${default_feature:-yes}
debug_mutex="no"
plugins="$default_feature"
rng_none="no"
@@ -1044,38 +1036,6 @@ for opt do
;;
--enable-replication) replication="yes"
;;
- --disable-bochs) bochs="no"
- ;;
- --enable-bochs) bochs="yes"
- ;;
- --disable-cloop) cloop="no"
- ;;
- --enable-cloop) cloop="yes"
- ;;
- --disable-dmg) dmg="no"
- ;;
- --enable-dmg) dmg="yes"
- ;;
- --disable-qcow1) qcow1="no"
- ;;
- --enable-qcow1) qcow1="yes"
- ;;
- --disable-vdi) vdi="no"
- ;;
- --enable-vdi) vdi="yes"
- ;;
- --disable-vvfat) vvfat="no"
- ;;
- --enable-vvfat) vvfat="yes"
- ;;
- --disable-qed) qed="no"
- ;;
- --enable-qed) qed="yes"
- ;;
- --disable-parallels) parallels="no"
- ;;
- --enable-parallels) parallels="yes"
- ;;
--disable-vhost-user) vhost_user="no"
;;
--enable-vhost-user) vhost_user="yes"
@@ -1389,14 +1349,6 @@ cat << EOF
opengl opengl support
qom-cast-debug cast debugging support
tools build qemu-io, qemu-nbd and qemu-img tools
- bochs bochs image format support
- cloop cloop image format support
- dmg dmg image format support
- qcow1 qcow v1 image format support
- vdi vdi image format support
- vvfat vvfat image format support
- qed qed image format support
- parallels parallels image format support
debug-mutex mutex debugging support
rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
gio libgio support
@@ -3285,31 +3237,6 @@ if test "$debug_mutex" = "yes" ; then
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
fi
-if test "$bochs" = "yes" ; then
- echo "CONFIG_BOCHS=y" >> $config_host_mak
-fi
-if test "$cloop" = "yes" ; then
- echo "CONFIG_CLOOP=y" >> $config_host_mak
-fi
-if test "$dmg" = "yes" ; then
- echo "CONFIG_DMG=y" >> $config_host_mak
-fi
-if test "$qcow1" = "yes" ; then
- echo "CONFIG_QCOW1=y" >> $config_host_mak
-fi
-if test "$vdi" = "yes" ; then
- echo "CONFIG_VDI=y" >> $config_host_mak
-fi
-if test "$vvfat" = "yes" ; then
- echo "CONFIG_VVFAT=y" >> $config_host_mak
-fi
-if test "$qed" = "yes" ; then
- echo "CONFIG_QED=y" >> $config_host_mak
-fi
-if test "$parallels" = "yes" ; then
- echo "CONFIG_PARALLELS=y" >> $config_host_mak
-fi
-
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index 9584587462..ba1c468620 100644
--- a/meson.build
+++ b/meson.build
@@ -3467,14 +3467,14 @@ if have_block
summary_info += {'build virtiofs daemon': have_virtiofsd}
summary_info += {'Live block migration': config_host.has_key('CONFIG_LIVE_BLOCK_MIGRATION')}
summary_info += {'replication support': config_host.has_key('CONFIG_REPLICATION')}
- summary_info += {'bochs support': config_host.has_key('CONFIG_BOCHS')}
- summary_info += {'cloop support': config_host.has_key('CONFIG_CLOOP')}
- summary_info += {'dmg support': config_host.has_key('CONFIG_DMG')}
- summary_info += {'qcow v1 support': config_host.has_key('CONFIG_QCOW1')}
- summary_info += {'vdi support': config_host.has_key('CONFIG_VDI')}
- summary_info += {'vvfat support': config_host.has_key('CONFIG_VVFAT')}
- summary_info += {'qed support': config_host.has_key('CONFIG_QED')}
- summary_info += {'parallels support': config_host.has_key('CONFIG_PARALLELS')}
+ summary_info += {'bochs support': get_option('bochs').allowed()}
+ summary_info += {'cloop support': get_option('cloop').allowed()}
+ summary_info += {'dmg support': get_option('dmg').allowed()}
+ summary_info += {'qcow v1 support': get_option('qcow1').allowed()}
+ summary_info += {'vdi support': get_option('vdi').allowed()}
+ summary_info += {'vvfat support': get_option('vvfat').allowed()}
+ summary_info += {'qed support': get_option('qed').allowed()}
+ summary_info += {'parallels support': get_option('parallels').allowed()}
summary_info += {'FUSE exports': fuse}
endif
summary(summary_info, bool_yn: true, section: 'Block layer support')
diff --git a/meson_options.txt b/meson_options.txt
index 1b44b4e666..aef951eba1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -222,3 +222,19 @@ option('fdt', type: 'combo', value: 'auto',
option('selinux', type: 'feature', value: 'auto',
description: 'SELinux support in qemu-nbd')
+option('bochs', type: 'feature', value: 'auto',
+ description: 'bochs image format support')
+option('cloop', type: 'feature', value: 'auto',
+ description: 'cloop image format support')
+option('dmg', type: 'feature', value: 'auto',
+ description: 'dmg image format support')
+option('qcow1', type: 'feature', value: 'auto',
+ description: 'qcow1 image format support')
+option('vdi', type: 'feature', value: 'auto',
+ description: 'vdi image format support')
+option('vvfat', type: 'feature', value: 'auto',
+ description: 'vvfat image format support')
+option('qed', type: 'feature', value: 'auto',
+ description: 'qed image format support')
+option('parallels', type: 'feature', value: 'auto',
+ description: 'parallels image format support')
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index e040fa1501..e72c5f582e 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -28,16 +28,19 @@ meson_options_help() {
printf "%s\n" ' auth-pam PAM access control'
printf "%s\n" ' avx2 AVX2 optimizations'
printf "%s\n" ' avx512f AVX512F optimizations'
+ printf "%s\n" ' bochs bochs image format support'
printf "%s\n" ' bpf eBPF support'
printf "%s\n" ' brlapi brlapi character device driver'
printf "%s\n" ' bzip2 bzip2 support for DMG images'
printf "%s\n" ' cap-ng cap_ng support'
+ printf "%s\n" ' cloop cloop image format support'
printf "%s\n" ' cocoa Cocoa user interface (macOS only)'
printf "%s\n" ' coreaudio CoreAudio sound support'
printf "%s\n" ' crypto-afalg Linux AF_ALG crypto backend driver'
printf "%s\n" ' curl CURL block device driver'
printf "%s\n" ' curses curses UI'
printf "%s\n" ' dbus-display -display dbus support'
+ printf "%s\n" ' dmg dmg image format support'
printf "%s\n" ' docs Documentations build support'
printf "%s\n" ' dsound DirectSound sound support'
printf "%s\n" ' fuse FUSE block device export'
@@ -76,6 +79,9 @@ meson_options_help() {
printf "%s\n" ' nvmm NVMM acceleration support'
printf "%s\n" ' oss OSS sound support'
printf "%s\n" ' pa PulseAudio sound support'
+ printf "%s\n" ' parallels parallels image format support'
+ printf "%s\n" ' qcow1 qcow1 image format support'
+ printf "%s\n" ' qed qed image format support'
printf "%s\n" ' rbd Ceph block device driver'
printf "%s\n" ' sdl SDL user interface'
printf "%s\n" ' sdl-image SDL Image support for icons'
@@ -91,6 +97,7 @@ meson_options_help() {
printf "%s\n" ' u2f U2F emulation support'
printf "%s\n" ' usb-redir libusbredir support'
printf "%s\n" ' vde vde network backend support'
+ printf "%s\n" ' vdi vdi image format support'
printf "%s\n" ' vhost-user-blk-server'
printf "%s\n" ' build vhost-user-blk server'
printf "%s\n" ' virglrenderer virgl rendering support'
@@ -101,6 +108,7 @@ meson_options_help() {
printf "%s\n" ' vnc-png PNG compression for VNC server'
printf "%s\n" ' vnc-sasl SASL authentication for VNC server'
printf "%s\n" ' vte vte support for the gtk UI'
+ printf "%s\n" ' vvfat vvfat image format support'
printf "%s\n" ' whpx WHPX acceleration support'
printf "%s\n" ' xen Xen backend support'
printf "%s\n" ' xen-pci-passthrough'
@@ -120,6 +128,8 @@ _meson_option_parse() {
--disable-avx2) printf "%s" -Davx2=disabled ;;
--enable-avx512f) printf "%s" -Davx512f=enabled ;;
--disable-avx512f) printf "%s" -Davx512f=disabled ;;
+ --enable-bochs) printf "%s" -Dbochs=enabled ;;
+ --disable-bochs) printf "%s" -Dbochs=disabled ;;
--enable-bpf) printf "%s" -Dbpf=enabled ;;
--disable-bpf) printf "%s" -Dbpf=disabled ;;
--enable-brlapi) printf "%s" -Dbrlapi=enabled ;;
@@ -135,6 +145,8 @@ _meson_option_parse() {
--disable-cfi) printf "%s" -Dcfi=false ;;
--enable-cfi-debug) printf "%s" -Dcfi_debug=true ;;
--disable-cfi-debug) printf "%s" -Dcfi_debug=false ;;
+ --enable-cloop) printf "%s" -Dcloop=enabled ;;
+ --disable-cloop) printf "%s" -Dcloop=disabled ;;
--enable-cocoa) printf "%s" -Dcocoa=enabled ;;
--disable-cocoa) printf "%s" -Dcocoa=disabled ;;
--enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
@@ -147,6 +159,8 @@ _meson_option_parse() {
--disable-curses) printf "%s" -Dcurses=disabled ;;
--enable-dbus-display) printf "%s" -Ddbus_display=enabled ;;
--disable-dbus-display) printf "%s" -Ddbus_display=disabled ;;
+ --enable-dmg) printf "%s" -Ddmg=enabled ;;
+ --disable-dmg) printf "%s" -Ddmg=disabled ;;
--enable-docs) printf "%s" -Ddocs=enabled ;;
--disable-docs) printf "%s" -Ddocs=disabled ;;
--enable-dsound) printf "%s" -Ddsound=enabled ;;
@@ -231,6 +245,12 @@ _meson_option_parse() {
--disable-oss) printf "%s" -Doss=disabled ;;
--enable-pa) printf "%s" -Dpa=enabled ;;
--disable-pa) printf "%s" -Dpa=disabled ;;
+ --enable-parallels) printf "%s" -Dparallels=enabled ;;
+ --disable-parallels) printf "%s" -Dparallels=disabled ;;
+ --enable-qcow1) printf "%s" -Dqcow1=enabled ;;
+ --disable-qcow1) printf "%s" -Dqcow1=disabled ;;
+ --enable-qed) printf "%s" -Dqed=enabled ;;
+ --disable-qed) printf "%s" -Dqed=disabled ;;
--enable-rbd) printf "%s" -Drbd=enabled ;;
--disable-rbd) printf "%s" -Drbd=disabled ;;
--enable-sdl) printf "%s" -Dsdl=enabled ;;
@@ -269,6 +289,8 @@ _meson_option_parse() {
--disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
--enable-vde) printf "%s" -Dvde=enabled ;;
--disable-vde) printf "%s" -Dvde=disabled ;;
+ --enable-vdi) printf "%s" -Dvdi=enabled ;;
+ --disable-vdi) printf "%s" -Dvdi=disabled ;;
--enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;;
--disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;;
--enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;
@@ -287,6 +309,8 @@ _meson_option_parse() {
--disable-vnc-sasl) printf "%s" -Dvnc_sasl=disabled ;;
--enable-vte) printf "%s" -Dvte=enabled ;;
--disable-vte) printf "%s" -Dvte=disabled ;;
+ --enable-vvfat) printf "%s" -Dvvfat=enabled ;;
+ --disable-vvfat) printf "%s" -Dvvfat=disabled ;;
--enable-whpx) printf "%s" -Dwhpx=enabled ;;
--disable-whpx) printf "%s" -Dwhpx=disabled ;;
--enable-xen) printf "%s" -Dxen=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 10/27] configure, meson: move block layer options to meson_options.txt
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (8 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 09/27] configure, meson: move image format options to meson_options.txt Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 11/27] meson: define qemu_cflags/qemu_ldflags Paolo Bonzini
` (16 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Unlike image formats, these also require an entry in config-host.h.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/meson.build | 4 +++-
configure | 20 --------------------
meson.build | 11 ++++++++---
meson_options.txt | 4 ++++
migration/meson.build | 4 +++-
scripts/meson-buildoptions.sh | 7 +++++++
tests/unit/meson.build | 2 +-
7 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/block/meson.build b/block/meson.build
index 4afde2ebf8..8a1ce58c9c 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -80,7 +80,9 @@ block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c')
block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit])
block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c'))
block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c'))
-block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
+if not get_option('replication').disabled()
+ block_ss.add(files('replication.c'))
+endif
block_ss.add(when: libaio, if_true: files('linux-aio.c'))
block_ss.add(when: linux_io_uring, if_true: files('io_uring.c'))
diff --git a/configure b/configure
index acee571fbc..785d52ef2b 100755
--- a/configure
+++ b/configure
@@ -329,8 +329,6 @@ coroutine=""
coroutine_pool="$default_feature"
debug_stack_usage="no"
tls_priority="NORMAL"
-live_block_migration=${default_feature:-yes}
-replication=${default_feature:-yes}
debug_mutex="no"
plugins="$default_feature"
rng_none="no"
@@ -1028,14 +1026,6 @@ for opt do
;;
--disable-pvrdma) pvrdma="no"
;;
- --disable-live-block-migration) live_block_migration="no"
- ;;
- --enable-live-block-migration) live_block_migration="yes"
- ;;
- --disable-replication) replication="no"
- ;;
- --enable-replication) replication="yes"
- ;;
--disable-vhost-user) vhost_user="no"
;;
--enable-vhost-user) vhost_user="yes"
@@ -1343,9 +1333,7 @@ cat << EOF
vhost-kernel vhost kernel backend support
vhost-user vhost-user backend support
vhost-vdpa vhost-vdpa kernel backend support
- live-block-migration Block migration in the main migration stream
coroutine-pool coroutine freelist (better performance)
- replication replication support
opengl opengl support
qom-cast-debug cast debugging support
tools build qemu-io, qemu-nbd and qemu-img tools
@@ -3216,10 +3204,6 @@ if test "$cmpxchg128" = "yes" ; then
echo "CONFIG_CMPXCHG128=y" >> $config_host_mak
fi
-if test "$live_block_migration" = "yes" ; then
- echo "CONFIG_LIVE_BLOCK_MIGRATION=y" >> $config_host_mak
-fi
-
if test "$rdma" = "yes" ; then
echo "CONFIG_RDMA=y" >> $config_host_mak
echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
@@ -3229,10 +3213,6 @@ if test "$pvrdma" = "yes" ; then
echo "CONFIG_PVRDMA=y" >> $config_host_mak
fi
-if test "$replication" = "yes" ; then
- echo "CONFIG_REPLICATION=y" >> $config_host_mak
-fi
-
if test "$debug_mutex" = "yes" ; then
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index ba1c468620..1199279209 100644
--- a/meson.build
+++ b/meson.build
@@ -1539,6 +1539,9 @@ config_host_data.set_quoted('CONFIG_HOST_DSOSUF', host_dsosuf)
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
config_host_data.set('HOST_WORDS_BIGENDIAN', host_machine.endian() == 'big')
+config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION', get_option('live_block_migration').allowed())
+config_host_data.set('CONFIG_REPLICATION', get_option('live_block_migration').allowed())
+
# has_header
config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))
config_host_data.set('CONFIG_LINUX_MAGIC_H', cc.has_header('linux/magic.h'))
@@ -2688,7 +2691,9 @@ if have_block
'job.c',
'qemu-io-cmds.c',
))
- block_ss.add(when: 'CONFIG_REPLICATION', if_true: files('replication.c'))
+ if config_host_data.get('CONFIG_REPLICATION')
+ block_ss.add(files('replication.c'))
+ endif
subdir('nbd')
subdir('scsi')
@@ -3465,8 +3470,8 @@ if have_block
summary_info += {'Use block whitelist in tools': config_host.has_key('CONFIG_BDRV_WHITELIST_TOOLS')}
summary_info += {'VirtFS support': have_virtfs}
summary_info += {'build virtiofs daemon': have_virtiofsd}
- summary_info += {'Live block migration': config_host.has_key('CONFIG_LIVE_BLOCK_MIGRATION')}
- summary_info += {'replication support': config_host.has_key('CONFIG_REPLICATION')}
+ summary_info += {'Live block migration': config_host_data.get('CONFIG_LIVE_BLOCK_MIGRATION')}
+ summary_info += {'replication support': config_host_data.get('CONFIG_REPLICATION')}
summary_info += {'bochs support': get_option('bochs').allowed()}
summary_info += {'cloop support': get_option('cloop').allowed()}
summary_info += {'dmg support': get_option('dmg').allowed()}
diff --git a/meson_options.txt b/meson_options.txt
index aef951eba1..3bfaa77805 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -222,6 +222,10 @@ option('fdt', type: 'combo', value: 'auto',
option('selinux', type: 'feature', value: 'auto',
description: 'SELinux support in qemu-nbd')
+option('live_block_migration', type: 'feature', value: 'auto',
+ description: 'block migration in the main migration stream')
+option('replication', type: 'feature', value: 'auto',
+ description: 'replication support')
option('bochs', type: 'feature', value: 'auto',
description: 'bochs image format support')
option('cloop', type: 'feature', value: 'auto',
diff --git a/migration/meson.build b/migration/meson.build
index f8714dcb15..8b5ca5c047 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -28,7 +28,9 @@ softmmu_ss.add(files(
), gnutls)
softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c'))
-softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c'))
+if get_option('live_block_migration').allowed()
+ softmmu_ss.add(files('block.c'))
+endif
softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c'))
specific_ss.add(when: 'CONFIG_SOFTMMU',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index e72c5f582e..3ead845808 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -67,6 +67,8 @@ meson_options_help() {
printf "%s\n" ' libxml2 libxml2 support for Parallels image format'
printf "%s\n" ' linux-aio Linux AIO support'
printf "%s\n" ' linux-io-uring Linux io_uring support'
+ printf "%s\n" ' live-block-migration'
+ printf "%s\n" ' block migration in the main migration stream'
printf "%s\n" ' lzfse lzfse support for DMG images'
printf "%s\n" ' lzo lzo compression support'
printf "%s\n" ' malloc-trim enable libc malloc_trim() for memory optimization'
@@ -83,6 +85,7 @@ meson_options_help() {
printf "%s\n" ' qcow1 qcow1 image format support'
printf "%s\n" ' qed qed image format support'
printf "%s\n" ' rbd Ceph block device driver'
+ printf "%s\n" ' replication replication support'
printf "%s\n" ' sdl SDL user interface'
printf "%s\n" ' sdl-image SDL Image support for icons'
printf "%s\n" ' seccomp seccomp support'
@@ -220,6 +223,8 @@ _meson_option_parse() {
--disable-linux-aio) printf "%s" -Dlinux_aio=disabled ;;
--enable-linux-io-uring) printf "%s" -Dlinux_io_uring=enabled ;;
--disable-linux-io-uring) printf "%s" -Dlinux_io_uring=disabled ;;
+ --enable-live-block-migration) printf "%s" -Dlive_block_migration=enabled ;;
+ --disable-live-block-migration) printf "%s" -Dlive_block_migration=disabled ;;
--enable-lzfse) printf "%s" -Dlzfse=enabled ;;
--disable-lzfse) printf "%s" -Dlzfse=disabled ;;
--enable-lzo) printf "%s" -Dlzo=enabled ;;
@@ -253,6 +258,8 @@ _meson_option_parse() {
--disable-qed) printf "%s" -Dqed=disabled ;;
--enable-rbd) printf "%s" -Drbd=enabled ;;
--disable-rbd) printf "%s" -Drbd=disabled ;;
+ --enable-replication) printf "%s" -Dreplication=enabled ;;
+ --disable-replication) printf "%s" -Dreplication=disabled ;;
--enable-sdl) printf "%s" -Dsdl=enabled ;;
--disable-sdl) printf "%s" -Dsdl=disabled ;;
--enable-sdl-image) printf "%s" -Dsdl_image=enabled ;;
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 64a5e7bfde..0959061faf 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -106,7 +106,7 @@ if have_block
if 'CONFIG_POSIX' in config_host
tests += {'test-image-locking': [testblock]}
endif
- if 'CONFIG_REPLICATION' in config_host
+ if config_host_data.get('CONFIG_REPLICATION')
tests += {'test-replication': [testblock]}
endif
if nettle.found() or gcrypt.found()
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 11/27] meson: define qemu_cflags/qemu_ldflags
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (9 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 10/27] configure, meson: move block layer " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-04 5:08 ` Philippe Mathieu-Daudé via
2022-02-03 17:33 ` [PATCH 12/27] configure, meson: move some default-disabled options to meson_options.txt Paolo Bonzini
` (15 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Prepare for moving more compiler tests to Meson. If the full set
of compiler flags is needed in a cc.compiles/cc.links test, it will
be handy to have a variable analogous to QEMU_CFLAGS.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 1199279209..f9aa9a1dab 100644
--- a/meson.build
+++ b/meson.build
@@ -163,6 +163,10 @@ endif
# Compiler flags #
##################
+qemu_cflags = config_host['QEMU_CFLAGS'].split()
+qemu_cxxflags = config_host['QEMU_CXXFLAGS'].split()
+qemu_ldflags = config_host['QEMU_LDFLAGS'].split()
+
# Specify linker-script with add_project_link_arguments so that it is not placed
# within a linker --start-group/--end-group pair
if get_option('fuzzing')
@@ -198,12 +202,9 @@ if get_option('fuzzing')
endif
endif
-add_global_arguments(config_host['QEMU_CFLAGS'].split(),
- native: false, language: ['c', 'objc'])
-add_global_arguments(config_host['QEMU_CXXFLAGS'].split(),
- native: false, language: 'cpp')
-add_global_link_arguments(config_host['QEMU_LDFLAGS'].split(),
- native: false, language: ['c', 'cpp', 'objc'])
+add_global_arguments(qemu_cflags, native: false, language: ['c', 'objc'])
+add_global_arguments(qemu_cxxflags, native: false, language: ['cpp'])
+add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 'cpp', 'objc'])
if targetos == 'linux'
add_project_arguments('-isystem', meson.current_source_dir() / 'linux-headers',
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 11/27] meson: define qemu_cflags/qemu_ldflags
2022-02-03 17:33 ` [PATCH 11/27] meson: define qemu_cflags/qemu_ldflags Paolo Bonzini
@ 2022-02-04 5:08 ` Philippe Mathieu-Daudé via
0 siblings, 0 replies; 46+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-02-04 5:08 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: marcandre.lureau
On 3/2/22 18:33, Paolo Bonzini wrote:
> Prepare for moving more compiler tests to Meson. If the full set
> of compiler flags is needed in a cc.compiles/cc.links test, it will
> be handy to have a variable analogous to QEMU_CFLAGS.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> meson.build | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 12/27] configure, meson: move some default-disabled options to meson_options.txt
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (10 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 11/27] meson: define qemu_cflags/qemu_ldflags Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 13/27] configure, meson: move coroutine " Paolo Bonzini
` (14 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
These do not depend on --with-default-features, so they become
booleans in meson too.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 61 +---------------------------------
crypto/meson.build | 2 +-
meson.build | 23 +++++++++----
meson_options.txt | 12 +++++++
scripts/meson-buildoptions.sh | 21 ++++++++++++
tests/check-block.sh | 4 ---
tests/qemu-iotests/meson.build | 2 +-
7 files changed, 53 insertions(+), 72 deletions(-)
diff --git a/configure b/configure
index 785d52ef2b..a3aefb99c2 100755
--- a/configure
+++ b/configure
@@ -238,7 +238,6 @@ cross_prefix=""
audio_drv_list="default"
block_drv_rw_whitelist=""
block_drv_ro_whitelist=""
-block_drv_whitelist_tools="no"
host_cc="cc"
debug_info="yes"
lto="false"
@@ -299,7 +298,6 @@ vhost_user_fs="$default_feature"
vhost_vdpa="$default_feature"
rdma="$default_feature"
pvrdma="$default_feature"
-gprof="no"
debug_tcg="no"
debug="no"
sanitizers="no"
@@ -311,13 +309,11 @@ modules="no"
module_upgrades="no"
prefix="/usr/local"
qemu_suffix="qemu"
-profiler="no"
softmmu="yes"
linux_user=""
bsd_user=""
pkgversion=""
pie=""
-qom_cast_debug="yes"
trace_backends="log"
trace_file="trace"
opengl="$default_feature"
@@ -329,9 +325,7 @@ coroutine=""
coroutine_pool="$default_feature"
debug_stack_usage="no"
tls_priority="NORMAL"
-debug_mutex="no"
plugins="$default_feature"
-rng_none="no"
secret_keyring="$default_feature"
meson=""
meson_args=""
@@ -806,8 +800,6 @@ for opt do
;;
--without-default-features) # processed above
;;
- --enable-gprof) gprof="yes"
- ;;
--enable-gcov) gcov="yes"
;;
--static)
@@ -848,20 +840,12 @@ for opt do
# configure to be used by RPM and similar macros that set
# lots of directory switches by default.
;;
- --disable-qom-cast-debug) qom_cast_debug="no"
- ;;
- --enable-qom-cast-debug) qom_cast_debug="yes"
- ;;
--audio-drv-list=*) audio_drv_list="$optarg"
;;
--block-drv-rw-whitelist=*|--block-drv-whitelist=*) block_drv_rw_whitelist=$(echo "$optarg" | sed -e 's/,/ /g')
;;
--block-drv-ro-whitelist=*) block_drv_ro_whitelist=$(echo "$optarg" | sed -e 's/,/ /g')
;;
- --enable-block-drv-whitelist-in-tools) block_drv_whitelist_tools="yes"
- ;;
- --disable-block-drv-whitelist-in-tools) block_drv_whitelist_tools="no"
- ;;
--enable-debug-tcg) debug_tcg="yes"
;;
--disable-debug-tcg) debug_tcg="no"
@@ -869,7 +853,7 @@ for opt do
--enable-debug)
# Enable debugging options that aren't excessively noisy
debug_tcg="yes"
- debug_mutex="yes"
+ meson_option_parse --enable-debug-mutex ""
debug="yes"
fortify_source="no"
;;
@@ -898,8 +882,6 @@ for opt do
;;
--enable-tcg) tcg="enabled"
;;
- --enable-profiler) profiler="yes"
- ;;
--disable-system) softmmu="no"
;;
--enable-system) softmmu="yes"
@@ -1051,10 +1033,6 @@ for opt do
--with-git-submodules=*)
git_submodules_action="$optarg"
;;
- --enable-debug-mutex) debug_mutex=yes
- ;;
- --disable-debug-mutex) debug_mutex=no
- ;;
--enable-plugins) if test "$mingw32" = "yes"; then
error_exit "TCG plugins not currently supported on Windows platforms"
else
@@ -1069,10 +1047,6 @@ for opt do
;;
--gdb=*) gdb_bin="$optarg"
;;
- --enable-rng-none) rng_none=yes
- ;;
- --disable-rng-none) rng_none=no
- ;;
--enable-keyring) secret_keyring="yes"
;;
--disable-keyring) secret_keyring="no"
@@ -1289,8 +1263,6 @@ Advanced options (experts only):
--block-drv-ro-whitelist=L
set block driver read-only whitelist
(by default affects only QEMU, not tools like qemu-img)
- --enable-block-drv-whitelist-in-tools
- use block whitelist also in tools instead of only QEMU
--with-trace-file=NAME Full PATH,NAME of file to store traces
Default:trace-<pid>
--cpu=CPU Build for host CPU [$cpu]
@@ -1300,8 +1272,6 @@ Advanced options (experts only):
--with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
--with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb)
--tls-priority default TLS protocol/cipher priority string
- --enable-gprof QEMU profiling with gprof
- --enable-profiler profiler support
--enable-debug-stack-usage
track the maximum stack usage of stacks created by qemu_alloc_stack
--enable-plugins
@@ -1335,10 +1305,7 @@ cat << EOF
vhost-vdpa vhost-vdpa kernel backend support
coroutine-pool coroutine freelist (better performance)
opengl opengl support
- qom-cast-debug cast debugging support
tools build qemu-io, qemu-nbd and qemu-img tools
- debug-mutex mutex debugging support
- rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
gio libgio support
slirp-smbd use smbd (at path --smbd=*) in slirp networking
@@ -2869,11 +2836,6 @@ alpha)
;;
esac
-if test "$gprof" = "yes" ; then
- QEMU_CFLAGS="-p $QEMU_CFLAGS"
- QEMU_LDFLAGS="-p $QEMU_LDFLAGS"
-fi
-
if test "$have_asan" = "yes"; then
QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS"
QEMU_LDFLAGS="-fsanitize=address $QEMU_LDFLAGS"
@@ -3068,9 +3030,6 @@ fi
if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak
fi
-if test "$profiler" = "yes" ; then
- echo "CONFIG_PROFILER=y" >> $config_host_mak
-fi
if test "$want_tools" = "yes" ; then
echo "CONFIG_TOOLS=y" >> $config_host_mak
fi
@@ -3081,14 +3040,8 @@ if test "$slirp_smbd" = "yes" ; then
echo "CONFIG_SLIRP_SMBD=y" >> $config_host_mak
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
fi
-if test "$gprof" = "yes" ; then
- echo "CONFIG_GPROF=y" >> $config_host_mak
-fi
echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
-if test "$block_drv_whitelist_tools" = "yes" ; then
- echo "CONFIG_BDRV_WHITELIST_TOOLS=y" >> $config_host_mak
-fi
qemu_version=$(head $source_path/VERSION)
echo "PKGVERSION=$pkgversion" >>$config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak
@@ -3169,10 +3122,6 @@ if [ "$bsd" = "yes" ] ; then
echo "CONFIG_BSD=y" >> $config_host_mak
fi
-if test "$qom_cast_debug" = "yes" ; then
- echo "CONFIG_QOM_CAST_DEBUG=y" >> $config_host_mak
-fi
-
echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
if test "$coroutine_pool" = "yes" ; then
echo "CONFIG_COROUTINE_POOL=1" >> $config_host_mak
@@ -3213,10 +3162,6 @@ if test "$pvrdma" = "yes" ; then
echo "CONFIG_PVRDMA=y" >> $config_host_mak
fi
-if test "$debug_mutex" = "yes" ; then
- echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
-fi
-
if test "$plugins" = "yes" ; then
echo "CONFIG_PLUGIN=y" >> $config_host_mak
fi
@@ -3260,10 +3205,6 @@ echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
echo "STRIP=$strip" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
-if test "$rng_none" = "yes"; then
- echo "CONFIG_RNG_NONE=y" >> $config_host_mak
-fi
-
# use included Linux headers
if test "$linux" = "yes" ; then
mkdir -p linux-headers
diff --git a/crypto/meson.build b/crypto/meson.build
index 9bf3a431fe..19c44bea89 100644
--- a/crypto/meson.build
+++ b/crypto/meson.build
@@ -50,7 +50,7 @@ if gcrypt.found()
util_ss.add(gcrypt, files('random-gcrypt.c'))
elif gnutls.found()
util_ss.add(gnutls, files('random-gnutls.c'))
-elif 'CONFIG_RNG_NONE' in config_host
+elif get_option('rng_none')
util_ss.add(files('random-none.c'))
else
util_ss.add(files('random-platform.c'))
diff --git a/meson.build b/meson.build
index f9aa9a1dab..610a6d4a77 100644
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,12 @@ qemu_cflags = config_host['QEMU_CFLAGS'].split()
qemu_cxxflags = config_host['QEMU_CXXFLAGS'].split()
qemu_ldflags = config_host['QEMU_LDFLAGS'].split()
+if get_option('gprof')
+ qemu_cflags += ['-p']
+ qemu_cxxflags += ['-p']
+ qemu_ldflags += ['-p']
+endif
+
# Specify linker-script with add_project_link_arguments so that it is not placed
# within a linker --start-group/--end-group pair
if get_option('fuzzing')
@@ -1459,6 +1465,7 @@ config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_opti
config_host_data.set('HOST_' + host_arch.to_upper(), 1)
config_host_data.set('CONFIG_ATTR', libattr.found())
+config_host_data.set('CONFIG_BDRV_WHITELIST_TOOLS', get_option('block_drv_whitelist_in_tools'))
config_host_data.set('CONFIG_BRLAPI', brlapi.found())
config_host_data.set('CONFIG_COCOA', cocoa.found())
config_host_data.set('CONFIG_FUZZ', get_option('fuzzing'))
@@ -1492,6 +1499,7 @@ config_host_data.set('CONFIG_LINUX_AIO', libaio.found())
config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
config_host_data.set('CONFIG_NUMA', numa.found())
+config_host_data.set('CONFIG_PROFILER', get_option('profiler'))
config_host_data.set('CONFIG_RBD', rbd.found())
config_host_data.set('CONFIG_SDL', sdl.found())
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
@@ -1540,7 +1548,10 @@ config_host_data.set_quoted('CONFIG_HOST_DSOSUF', host_dsosuf)
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
config_host_data.set('HOST_WORDS_BIGENDIAN', host_machine.endian() == 'big')
+config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex'))
+config_host_data.set('CONFIG_GPROF', get_option('gprof'))
config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION', get_option('live_block_migration').allowed())
+config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug'))
config_host_data.set('CONFIG_REPLICATION', get_option('live_block_migration').allowed())
# has_header
@@ -3344,7 +3355,7 @@ if 'simple' in get_option('trace_backends')
summary_info += {'Trace output file': get_option('trace_file') + '-<pid>'}
endif
summary_info += {'D-Bus display': dbus_display}
-summary_info += {'QOM debugging': config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
+summary_info += {'QOM debugging': get_option('qom_cast_debug')}
summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
@@ -3390,18 +3401,18 @@ if link_args.length() > 0
endif
summary_info += {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']}
summary_info += {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']}
-summary_info += {'profiler': config_host.has_key('CONFIG_PROFILER')}
+summary_info += {'profiler': get_option('profiler')}
summary_info += {'link-time optimization (LTO)': get_option('b_lto')}
summary_info += {'PIE': get_option('b_pie')}
summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
summary_info += {'malloc trim support': has_malloc_trim}
summary_info += {'membarrier': have_membarrier}
summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
-summary_info += {'mutex debugging': config_host.has_key('CONFIG_DEBUG_MUTEX')}
+summary_info += {'mutex debugging': get_option('debug_mutex')}
summary_info += {'memory allocator': get_option('malloc')}
summary_info += {'avx2 optimization': config_host_data.get('CONFIG_AVX2_OPT')}
summary_info += {'avx512f optimization': config_host_data.get('CONFIG_AVX512F_OPT')}
-summary_info += {'gprof enabled': config_host.has_key('CONFIG_GPROF')}
+summary_info += {'gprof enabled': get_option('gprof')}
summary_info += {'gcov': get_option('b_coverage')}
summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
summary_info += {'CFI support': get_option('cfi')}
@@ -3468,7 +3479,7 @@ summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] == '1
if have_block
summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
- summary_info += {'Use block whitelist in tools': config_host.has_key('CONFIG_BDRV_WHITELIST_TOOLS')}
+ summary_info += {'Use block whitelist in tools': get_option('block_drv_whitelist_in_tools')}
summary_info += {'VirtFS support': have_virtfs}
summary_info += {'build virtiofs daemon': have_virtiofsd}
summary_info += {'Live block migration': config_host_data.get('CONFIG_LIVE_BLOCK_MIGRATION')}
@@ -3498,7 +3509,7 @@ if nettle.found()
summary_info += {' XTS': xts != 'private'}
endif
summary_info += {'AF_ALG support': have_afalg}
-summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
+summary_info += {'rng-none': get_option('rng_none')}
summary_info += {'Linux keyring': config_host.has_key('CONFIG_SECRET_KEYRING')}
summary(summary_info, bool_yn: true, section: 'Crypto')
diff --git a/meson_options.txt b/meson_options.txt
index 3bfaa77805..781e4d5170 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -242,3 +242,15 @@ option('qed', type: 'feature', value: 'auto',
description: 'qed image format support')
option('parallels', type: 'feature', value: 'auto',
description: 'parallels image format support')
+option('block_drv_whitelist_in_tools', type: 'boolean', value: false,
+ description: 'use block whitelist also in tools instead of only QEMU')
+option('rng_none', type: 'boolean', value: false,
+ description: 'dummy RNG, avoid using /dev/(u)random and getrandom()')
+option('debug_mutex', type: 'boolean', value: false,
+ description: 'mutex debugging support')
+option('qom_cast_debug', type: 'boolean', value: false,
+ description: 'cast debugging support')
+option('gprof', type: 'boolean', value: false,
+ description: 'QEMU profiling with gprof')
+option('profiler', type: 'boolean', value: false,
+ description: 'profiler support')
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 3ead845808..e3e5167fb9 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -1,16 +1,25 @@
# This file is generated by meson-buildoptions.py, do not edit!
meson_options_help() {
+ printf "%s\n" ' --enable-block-drv-whitelist-in-tools'
+ printf "%s\n" ' use block whitelist also in tools instead of only'
+ printf "%s\n" ' QEMU'
printf "%s\n" ' --enable-capstone[=CHOICE]'
printf "%s\n" ' Whether and how to find the capstone library'
printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-cfi Control-Flow Integrity (CFI)'
printf "%s\n" ' --enable-cfi-debug Verbose errors in case of CFI violation'
+ printf "%s\n" ' --enable-debug-mutex mutex debugging support'
printf "%s\n" ' --enable-fdt[=CHOICE] Whether and how to find the libfdt library'
printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-fuzzing build fuzzing targets'
+ printf "%s\n" ' --enable-gprof QEMU profiling with gprof'
printf "%s\n" ' --disable-install-blobs install provided firmware blobs'
printf "%s\n" ' --enable-malloc=CHOICE choose memory allocator to use [system] (choices:'
printf "%s\n" ' jemalloc/system/tcmalloc)'
+ printf "%s\n" ' --enable-profiler profiler support'
+ printf "%s\n" ' --enable-qom-cast-debug cast debugging support'
+ printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u)random and'
+ printf "%s\n" ' getrandom()'
printf "%s\n" ' --enable-slirp[=CHOICE] Whether and how to find the slirp library'
printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-strip Strip targets on install'
@@ -131,6 +140,8 @@ _meson_option_parse() {
--disable-avx2) printf "%s" -Davx2=disabled ;;
--enable-avx512f) printf "%s" -Davx512f=enabled ;;
--disable-avx512f) printf "%s" -Davx512f=disabled ;;
+ --enable-block-drv-whitelist-in-tools) printf "%s" -Dblock_drv_whitelist_in_tools=true ;;
+ --disable-block-drv-whitelist-in-tools) printf "%s" -Dblock_drv_whitelist_in_tools=false ;;
--enable-bochs) printf "%s" -Dbochs=enabled ;;
--disable-bochs) printf "%s" -Dbochs=disabled ;;
--enable-bpf) printf "%s" -Dbpf=enabled ;;
@@ -162,6 +173,8 @@ _meson_option_parse() {
--disable-curses) printf "%s" -Dcurses=disabled ;;
--enable-dbus-display) printf "%s" -Ddbus_display=enabled ;;
--disable-dbus-display) printf "%s" -Ddbus_display=disabled ;;
+ --enable-debug-mutex) printf "%s" -Ddebug_mutex=true ;;
+ --disable-debug-mutex) printf "%s" -Ddebug_mutex=false ;;
--enable-dmg) printf "%s" -Ddmg=enabled ;;
--disable-dmg) printf "%s" -Ddmg=disabled ;;
--enable-docs) printf "%s" -Ddocs=enabled ;;
@@ -185,6 +198,8 @@ _meson_option_parse() {
--disable-glusterfs) printf "%s" -Dglusterfs=disabled ;;
--enable-gnutls) printf "%s" -Dgnutls=enabled ;;
--disable-gnutls) printf "%s" -Dgnutls=disabled ;;
+ --enable-gprof) printf "%s" -Dgprof=true ;;
+ --disable-gprof) printf "%s" -Dgprof=false ;;
--enable-gtk) printf "%s" -Dgtk=enabled ;;
--disable-gtk) printf "%s" -Dgtk=disabled ;;
--enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;;
@@ -252,14 +267,20 @@ _meson_option_parse() {
--disable-pa) printf "%s" -Dpa=disabled ;;
--enable-parallels) printf "%s" -Dparallels=enabled ;;
--disable-parallels) printf "%s" -Dparallels=disabled ;;
+ --enable-profiler) printf "%s" -Dprofiler=true ;;
+ --disable-profiler) printf "%s" -Dprofiler=false ;;
--enable-qcow1) printf "%s" -Dqcow1=enabled ;;
--disable-qcow1) printf "%s" -Dqcow1=disabled ;;
--enable-qed) printf "%s" -Dqed=enabled ;;
--disable-qed) printf "%s" -Dqed=disabled ;;
+ --enable-qom-cast-debug) printf "%s" -Dqom_cast_debug=true ;;
+ --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;;
--enable-rbd) printf "%s" -Drbd=enabled ;;
--disable-rbd) printf "%s" -Drbd=disabled ;;
--enable-replication) printf "%s" -Dreplication=enabled ;;
--disable-replication) printf "%s" -Dreplication=disabled ;;
+ --enable-rng-none) printf "%s" -Drng_none=true ;;
+ --disable-rng-none) printf "%s" -Drng_none=false ;;
--enable-sdl) printf "%s" -Dsdl=enabled ;;
--disable-sdl) printf "%s" -Dsdl=disabled ;;
--enable-sdl-image) printf "%s" -Dsdl_image=enabled ;;
diff --git a/tests/check-block.sh b/tests/check-block.sh
index 720a46bc36..18f7433901 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -18,10 +18,6 @@ skip() {
exit 0
}
-if grep -q "CONFIG_GPROF=y" config-host.mak 2>/dev/null ; then
- skip "GPROF is enabled ==> Not running the qemu-iotests."
-fi
-
# Disable tests with any sanitizer except for specific ones
SANITIZE_FLAGS=$( grep "CFLAGS.*-fsanitize" config-host.mak 2>/dev/null )
ALLOWED_SANITIZE_FLAGS="safe-stack cfi-icall"
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 5be3c74127..9747bb68a5 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -1,4 +1,4 @@
-if have_tools and targetos != 'windows'
+if have_tools and targetos != 'windows' and not get_option('gprof')
qemu_iotests_binaries = [qemu_img, qemu_io, qemu_nbd, qsd]
qemu_iotests_env = {'PYTHON': python.full_path()}
qemu_iotests_formats = {
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 13/27] configure, meson: move coroutine options to meson_options.txt
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (11 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 12/27] configure, meson: move some default-disabled options to meson_options.txt Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 14/27] configure, meson: move smbd " Paolo Bonzini
` (13 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 31 -------------------------------
meson.build | 11 +++++++++--
meson_options.txt | 4 ++++
scripts/meson-buildoptions.sh | 7 +++++++
4 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/configure b/configure
index a3aefb99c2..dda586cc69 100755
--- a/configure
+++ b/configure
@@ -322,8 +322,6 @@ vss_win32_sdk="$default_feature"
win_sdk="no"
want_tools="$default_feature"
coroutine=""
-coroutine_pool="$default_feature"
-debug_stack_usage="no"
tls_priority="NORMAL"
plugins="$default_feature"
secret_keyring="$default_feature"
@@ -937,12 +935,6 @@ for opt do
;;
--with-coroutine=*) coroutine="$optarg"
;;
- --disable-coroutine-pool) coroutine_pool="no"
- ;;
- --enable-coroutine-pool) coroutine_pool="yes"
- ;;
- --enable-debug-stack-usage) debug_stack_usage="yes"
- ;;
--disable-vhost-net) vhost_net="no"
;;
--enable-vhost-net) vhost_net="yes"
@@ -1272,8 +1264,6 @@ Advanced options (experts only):
--with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
--with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb)
--tls-priority default TLS protocol/cipher priority string
- --enable-debug-stack-usage
- track the maximum stack usage of stacks created by qemu_alloc_stack
--enable-plugins
enable plugins via shared library loading
--disable-containers don't use containers for cross-building
@@ -1303,7 +1293,6 @@ cat << EOF
vhost-kernel vhost kernel backend support
vhost-user vhost-user backend support
vhost-vdpa vhost-vdpa kernel backend support
- coroutine-pool coroutine freelist (better performance)
opengl opengl support
tools build qemu-io, qemu-nbd and qemu-img tools
gio libgio support
@@ -2519,17 +2508,6 @@ else
esac
fi
-if test "$coroutine_pool" = ""; then
- coroutine_pool=yes
-fi
-
-if test "$debug_stack_usage" = "yes"; then
- if test "$coroutine_pool" = "yes"; then
- echo "WARN: disabling coroutine pool for stack usage debugging"
- coroutine_pool=no
- fi
-fi
-
##################################################
# SafeStack
@@ -3123,15 +3101,6 @@ if [ "$bsd" = "yes" ] ; then
fi
echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
-if test "$coroutine_pool" = "yes" ; then
- echo "CONFIG_COROUTINE_POOL=1" >> $config_host_mak
-else
- echo "CONFIG_COROUTINE_POOL=0" >> $config_host_mak
-fi
-
-if test "$debug_stack_usage" = "yes" ; then
- echo "CONFIG_DEBUG_STACK_USAGE=y" >> $config_host_mak
-fi
if test "$have_asan_iface_fiber" = "yes" ; then
echo "CONFIG_ASAN_IFACE_FIBER=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 610a6d4a77..e44f8bf750 100644
--- a/meson.build
+++ b/meson.build
@@ -1548,7 +1548,14 @@ config_host_data.set_quoted('CONFIG_HOST_DSOSUF', host_dsosuf)
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
config_host_data.set('HOST_WORDS_BIGENDIAN', host_machine.endian() == 'big')
+have_coroutine_pool = get_option('coroutine_pool')
+if get_option('debug_stack_usage') and have_coroutine_pool
+ message('Disabling coroutine pool to measure stack usage')
+ have_coroutine_pool = false
+endif
+config_host_data.set10('CONFIG_COROUTINE_POOL', have_coroutine_pool)
config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex'))
+config_host_data.set('CONFIG_DEBUG_STACK_USAGE', get_option('debug_stack_usage'))
config_host_data.set('CONFIG_GPROF', get_option('gprof'))
config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION', get_option('live_block_migration').allowed())
config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug'))
@@ -3407,7 +3414,7 @@ summary_info += {'PIE': get_option('b_pie')}
summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
summary_info += {'malloc trim support': has_malloc_trim}
summary_info += {'membarrier': have_membarrier}
-summary_info += {'debug stack usage': config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
+summary_info += {'debug stack usage': get_option('debug_stack_usage')}
summary_info += {'mutex debugging': get_option('debug_mutex')}
summary_info += {'memory allocator': get_option('malloc')}
summary_info += {'avx2 optimization': config_host_data.get('CONFIG_AVX2_OPT')}
@@ -3475,7 +3482,7 @@ summary(summary_info, bool_yn: true, section: 'Targets and accelerators')
# Block layer
summary_info = {}
summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
-summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] == '1'}
+summary_info += {'coroutine pool': have_coroutine_pool}
if have_block
summary_info += {'Block whitelist (rw)': config_host['CONFIG_BDRV_RW_WHITELIST']}
summary_info += {'Block whitelist (ro)': config_host['CONFIG_BDRV_RO_WHITELIST']}
diff --git a/meson_options.txt b/meson_options.txt
index 781e4d5170..03ae957102 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -246,8 +246,12 @@ option('block_drv_whitelist_in_tools', type: 'boolean', value: false,
description: 'use block whitelist also in tools instead of only QEMU')
option('rng_none', type: 'boolean', value: false,
description: 'dummy RNG, avoid using /dev/(u)random and getrandom()')
+option('coroutine_pool', type: 'boolean', value: true,
+ description: 'coroutine freelist (better performance)')
option('debug_mutex', type: 'boolean', value: false,
description: 'mutex debugging support')
+option('debug_stack_usage', type: 'boolean', value: false,
+ description: 'measure coroutine stack usage')
option('qom_cast_debug', type: 'boolean', value: false,
description: 'cast debugging support')
option('gprof', type: 'boolean', value: false,
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index e3e5167fb9..74bc6458d4 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -8,7 +8,10 @@ meson_options_help() {
printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-cfi Control-Flow Integrity (CFI)'
printf "%s\n" ' --enable-cfi-debug Verbose errors in case of CFI violation'
+ printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better performance)'
printf "%s\n" ' --enable-debug-mutex mutex debugging support'
+ printf "%s\n" ' --enable-debug-stack-usage'
+ printf "%s\n" ' measure coroutine stack usage'
printf "%s\n" ' --enable-fdt[=CHOICE] Whether and how to find the libfdt library'
printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-fuzzing build fuzzing targets'
@@ -165,6 +168,8 @@ _meson_option_parse() {
--disable-cocoa) printf "%s" -Dcocoa=disabled ;;
--enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
--disable-coreaudio) printf "%s" -Dcoreaudio=disabled ;;
+ --enable-coroutine-pool) printf "%s" -Dcoroutine_pool=true ;;
+ --disable-coroutine-pool) printf "%s" -Dcoroutine_pool=false ;;
--enable-crypto-afalg) printf "%s" -Dcrypto_afalg=enabled ;;
--disable-crypto-afalg) printf "%s" -Dcrypto_afalg=disabled ;;
--enable-curl) printf "%s" -Dcurl=enabled ;;
@@ -175,6 +180,8 @@ _meson_option_parse() {
--disable-dbus-display) printf "%s" -Ddbus_display=disabled ;;
--enable-debug-mutex) printf "%s" -Ddebug_mutex=true ;;
--disable-debug-mutex) printf "%s" -Ddebug_mutex=false ;;
+ --enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=true ;;
+ --disable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=false ;;
--enable-dmg) printf "%s" -Ddmg=enabled ;;
--disable-dmg) printf "%s" -Ddmg=disabled ;;
--enable-docs) printf "%s" -Ddocs=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 14/27] configure, meson: move smbd options to meson_options.txt
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (12 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 13/27] configure, meson: move coroutine " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 15/27] configure, meson: move guest-agent, tools to meson Paolo Bonzini
` (12 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 26 ++------------------------
meson.build | 15 +++++++++++++--
meson_options.txt | 4 ++++
net/slirp.c | 16 ++++++++--------
scripts/meson-buildoptions.py | 1 +
scripts/meson-buildoptions.sh | 3 +++
6 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/configure b/configure
index dda586cc69..b836dfbd78 100755
--- a/configure
+++ b/configure
@@ -330,7 +330,6 @@ meson_args=""
ninja=""
gio="$default_feature"
skip_meson=no
-slirp_smbd="$default_feature"
# The following Meson options are handled manually (still they
# are included in the automatically generated help message)
@@ -416,6 +415,7 @@ objcopy="${OBJCOPY-${cross_prefix}objcopy}"
ld="${LD-${cross_prefix}ld}"
ranlib="${RANLIB-${cross_prefix}ranlib}"
nm="${NM-${cross_prefix}nm}"
+smbd="$SMBD"
strip="${STRIP-${cross_prefix}strip}"
windres="${WINDRES-${cross_prefix}windres}"
pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
@@ -535,7 +535,6 @@ darwin)
sunos)
solaris="yes"
make="${MAKE-gmake}"
- smbd="${SMBD-/usr/sfw/sbin/smbd}"
# needed for CMSG_ macros in sys/socket.h
QEMU_CFLAGS="-D_XOPEN_SOURCE=600 $QEMU_CFLAGS"
# needed for TIOCWIN* defines in termios.h
@@ -1047,10 +1046,6 @@ for opt do
;;
--disable-gio) gio=no
;;
- --enable-slirp-smbd) slirp_smbd=yes
- ;;
- --disable-slirp-smbd) slirp_smbd=no
- ;;
# backwards compatibility options
--enable-trace-backend=*) meson_option_parse "--enable-trace-backends=$optarg" "$optarg"
;;
@@ -1296,7 +1291,6 @@ cat << EOF
opengl opengl support
tools build qemu-io, qemu-nbd and qemu-img tools
gio libgio support
- slirp-smbd use smbd (at path --smbd=*) in slirp networking
NOTE: The object files are built at the place where configure is launched
EOF
@@ -2746,19 +2740,6 @@ case "$slirp" in
;;
esac
-# Check for slirp smbd dupport
-: ${smbd=${SMBD-/usr/sbin/smbd}}
-if test "$slirp_smbd" != "no" ; then
- if test "$mingw32" = "yes" ; then
- if test "$slirp_smbd" = "yes" ; then
- error_exit "Host smbd not supported on this platform."
- fi
- slirp_smbd=no
- else
- slirp_smbd=yes
- fi
-fi
-
##########################################
# check for usable __NR_keyctl syscall
@@ -3014,10 +2995,6 @@ fi
if test "$guest_agent" = "yes" ; then
echo "CONFIG_GUEST_AGENT=y" >> $config_host_mak
fi
-if test "$slirp_smbd" = "yes" ; then
- echo "CONFIG_SLIRP_SMBD=y" >> $config_host_mak
- echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
-fi
echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
qemu_version=$(head $source_path/VERSION)
@@ -3376,6 +3353,7 @@ if test "$skip_meson" = no; then
-Ddocdir="$docdir" \
-Dqemu_firmwarepath="$firmwarepath" \
-Dqemu_suffix="$qemu_suffix" \
+ -Dsmbd="$smbd" \
-Dsphinx_build="$sphinx_build" \
-Dtrace_file="$trace_file" \
-Doptimization=$(if test "$debug" = yes; then echo 0; else echo 2; fi) \
diff --git a/meson.build b/meson.build
index e44f8bf750..7fc2e3179e 100644
--- a/meson.build
+++ b/meson.build
@@ -1462,6 +1462,17 @@ config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix') /
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))
+have_slirp_smbd = get_option('slirp_smbd') \
+ .require(targetos != 'windows', error_message: 'Host smbd not supported on this platform.') \
+ .allowed()
+if have_slirp_smbd
+ smbd_path = get_option('smbd')
+ if smbd_path == ''
+ smbd_path = (targetos == 'solaris' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
+ endif
+ config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path)
+endif
+
config_host_data.set('HOST_' + host_arch.to_upper(), 1)
config_host_data.set('CONFIG_ATTR', libattr.found())
@@ -3337,8 +3348,8 @@ summary_info += {'genisoimage': config_host['GENISOIMAGE']}
if targetos == 'windows' and config_host.has_key('CONFIG_GUEST_AGENT')
summary_info += {'wixl': wixl}
endif
-if slirp_opt != 'disabled' and 'CONFIG_SLIRP_SMBD' in config_host
- summary_info += {'smbd': config_host['CONFIG_SMBD_COMMAND']}
+if slirp_opt != 'disabled' and have_system
+ summary_info += {'smbd': have_slirp_smbd ? smbd_path : false}
endif
summary(summary_info, bool_yn: true, section: 'Host binaries')
diff --git a/meson_options.txt b/meson_options.txt
index 03ae957102..59220b52c8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,6 +8,8 @@ option('docdir', type : 'string', value : 'doc',
description: 'Base directory for documentation installation (can be empty)')
option('qemu_firmwarepath', type : 'string', value : '',
description: 'search PATH for firmware files')
+option('smbd', type : 'string', value : '',
+ description: 'Path to smbd for slirp networking')
option('sphinx_build', type : 'string', value : '',
description: 'Use specified sphinx-build [$sphinx_build] for building document (default to be empty)')
option('default_devices', type : 'boolean', value : true,
@@ -258,3 +260,5 @@ option('gprof', type: 'boolean', value: false,
description: 'QEMU profiling with gprof')
option('profiler', type: 'boolean', value: false,
description: 'profiler support')
+option('slirp_smbd', type : 'feature', value : 'auto',
+ description: 'use smbd (at path --smbd=*) in slirp networking')
diff --git a/net/slirp.c b/net/slirp.c
index ad3a838e0b..bc5e9e4f77 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -27,7 +27,7 @@
#include "net/slirp.h"
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
#include <pwd.h>
#include <sys/wait.h>
#endif
@@ -91,7 +91,7 @@ typedef struct SlirpState {
Slirp *slirp;
Notifier poll_notifier;
Notifier exit_notifier;
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
gchar *smb_dir;
#endif
GSList *fwd;
@@ -104,7 +104,7 @@ static QTAILQ_HEAD(, SlirpState) slirp_stacks =
static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp);
static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp);
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
static int slirp_smb(SlirpState *s, const char *exported_dir,
struct in_addr vserver_addr, Error **errp);
static void slirp_smb_cleanup(SlirpState *s);
@@ -377,7 +377,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
struct in6_addr ip6_prefix;
struct in6_addr ip6_host;
struct in6_addr ip6_dns;
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
struct in_addr smbsrv = { .s_addr = 0 };
#endif
NetClientState *nc;
@@ -487,7 +487,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
return -1;
}
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
if (vsmbserver && !inet_aton(vsmbserver, &smbsrv)) {
error_setg(errp, "Failed to parse SMB address");
return -1;
@@ -602,7 +602,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
}
}
}
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
if (smb_export) {
if (slirp_smb(s, smb_export, smbsrv, errp) < 0) {
goto error;
@@ -794,7 +794,7 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
}
-#if defined(CONFIG_SLIRP_SMBD)
+#if defined(CONFIG_SMBD_COMMAND)
/* automatic user mode samba server configuration */
static void slirp_smb_cleanup(SlirpState *s)
@@ -909,7 +909,7 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
return 0;
}
-#endif /* defined(CONFIG_SLIRP_SMBD) */
+#endif /* defined(CONFIG_SMBD_COMMAND) */
static int guestfwd_can_read(void *opaque)
{
diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py
index 98ae944148..01b10f7ae0 100755
--- a/scripts/meson-buildoptions.py
+++ b/scripts/meson-buildoptions.py
@@ -32,6 +32,7 @@
"fuzzing_engine",
"qemu_firmwarepath",
"qemu_suffix",
+ "smbd",
"sphinx_build",
"trace_file",
}
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 74bc6458d4..07c1243b3f 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -102,6 +102,7 @@ meson_options_help() {
printf "%s\n" ' sdl-image SDL Image support for icons'
printf "%s\n" ' seccomp seccomp support'
printf "%s\n" ' selinux SELinux support in qemu-nbd'
+ printf "%s\n" ' slirp-smbd use smbd (at path --smbd=*) in slirp networking'
printf "%s\n" ' smartcard CA smartcard emulation support'
printf "%s\n" ' snappy snappy compression support'
printf "%s\n" ' sparse sparse checker'
@@ -299,6 +300,8 @@ _meson_option_parse() {
--enable-slirp) printf "%s" -Dslirp=enabled ;;
--disable-slirp) printf "%s" -Dslirp=disabled ;;
--enable-slirp=*) quote_sh "-Dslirp=$2" ;;
+ --enable-slirp-smbd) printf "%s" -Dslirp_smbd=enabled ;;
+ --disable-slirp-smbd) printf "%s" -Dslirp_smbd=disabled ;;
--enable-smartcard) printf "%s" -Dsmartcard=enabled ;;
--disable-smartcard) printf "%s" -Dsmartcard=disabled ;;
--enable-snappy) printf "%s" -Dsnappy=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 15/27] configure, meson: move guest-agent, tools to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (13 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 14/27] configure, meson: move smbd " Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 16/27] meson: refine check for whether to look for virglrenderer Paolo Bonzini
` (11 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 48 ++--------------------------
contrib/vhost-user-gpu/meson.build | 2 +-
docs/meson.build | 2 --
meson.build | 50 ++++++++++++++++--------------
meson_options.txt | 4 +++
qga/meson.build | 7 +++++
scripts/meson-buildoptions.sh | 6 ++++
tests/Makefile.include | 2 +-
tests/unit/meson.build | 4 +--
9 files changed, 50 insertions(+), 75 deletions(-)
diff --git a/configure b/configure
index b836dfbd78..8ab1e96835 100755
--- a/configure
+++ b/configure
@@ -317,10 +317,8 @@ pie=""
trace_backends="log"
trace_file="trace"
opengl="$default_feature"
-guest_agent="$default_feature"
vss_win32_sdk="$default_feature"
win_sdk="no"
-want_tools="$default_feature"
coroutine=""
tls_priority="NORMAL"
plugins="$default_feature"
@@ -960,10 +958,6 @@ for opt do
;;
--disable-zlib-test)
;;
- --enable-guest-agent) guest_agent="yes"
- ;;
- --disable-guest-agent) guest_agent="no"
- ;;
--with-vss-sdk) vss_win32_sdk=""
;;
--with-vss-sdk=*) vss_win32_sdk="$optarg"
@@ -976,10 +970,6 @@ for opt do
;;
--without-win-sdk) win_sdk="no"
;;
- --enable-tools) want_tools="yes"
- ;;
- --disable-tools) want_tools="no"
- ;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
@@ -1270,7 +1260,6 @@ cat << EOF
user supported user emulation targets
linux-user all linux usermode emulation targets
bsd-user all BSD usermode emulation targets
- guest-agent build the QEMU Guest Agent
pie Position Independent Executables
modules modules support (non-Windows)
module-upgrades try to load modules from alternate paths for upgrades
@@ -1289,7 +1278,6 @@ cat << EOF
vhost-user vhost-user backend support
vhost-vdpa vhost-vdpa kernel backend support
opengl opengl support
- tools build qemu-io, qemu-nbd and qemu-img tools
gio libgio support
NOTE: The object files are built at the place where configure is launched
@@ -1699,16 +1687,6 @@ else
exit 1
fi
-##########################################
-# system tools
-if test -z "$want_tools"; then
- if test "$softmmu" = "no"; then
- want_tools=no
- else
- want_tools=yes
- fi
-fi
-
#########################################
# vhost interdependencies and host support
@@ -2365,7 +2343,7 @@ fi
# check if we have VSS SDK headers for win
guest_agent_with_vss="no"
-if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \
+if test "$mingw32" = "yes" && \
test "$vss_win32_sdk" != "no" ; then
case "$vss_win32_sdk" in
"") vss_win32_include="-isystem $source_path" ;;
@@ -2402,7 +2380,7 @@ fi
# VSS provider from the source. It is usually unnecessary because the
# pre-compiled .tlb file is included.
-if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \
+if test "$mingw32" = "yes" && \
test "$guest_agent_with_vss" = "yes" ; then
if test -z "$win_sdk"; then
programfiles="$PROGRAMFILES"
@@ -2420,7 +2398,7 @@ fi
##########################################
# check if mingw environment provides a recent ntddscsi.h
guest_agent_ntddscsi="no"
-if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then
+if test "$mingw32" = "yes"; then
cat > $TMPC << EOF
#include <windows.h>
#include <ntddscsi.h>
@@ -2846,20 +2824,6 @@ if test "$mingw32" = "yes" ; then
done
fi
-# Probe for guest agent support/options
-
-if [ "$guest_agent" != "no" ]; then
- if [ "$softmmu" = no -a "$want_tools" = no ] ; then
- guest_agent=no
- elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then
- guest_agent=yes
- elif [ "$guest_agent" != yes ]; then
- guest_agent=no
- else
- error_exit "Guest agent is not supported on this platform"
- fi
-fi
-
# Guest agent Windows MSI package
if test "$QEMU_GA_MANUFACTURER" = ""; then
@@ -2989,12 +2953,6 @@ fi
if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak
fi
-if test "$want_tools" = "yes" ; then
- echo "CONFIG_TOOLS=y" >> $config_host_mak
-fi
-if test "$guest_agent" = "yes" ; then
- echo "CONFIG_GUEST_AGENT=y" >> $config_host_mak
-fi
echo "CONFIG_BDRV_RW_WHITELIST=$block_drv_rw_whitelist" >> $config_host_mak
echo "CONFIG_BDRV_RO_WHITELIST=$block_drv_ro_whitelist" >> $config_host_mak
qemu_version=$(head $source_path/VERSION)
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build
index 92c8f3a86a..b4e26045da 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -1,4 +1,4 @@
-if 'CONFIG_TOOLS' in config_host and virgl.found() and gbm.found() \
+if have_tools and virgl.found() and gbm.found() \
and 'CONFIG_LINUX' in config_host and pixman.found()
executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'),
dependencies: [qemuutil, pixman, gbm, virgl, vhost_user, opengl],
diff --git a/docs/meson.build b/docs/meson.build
index 57b28a3146..831d4aea2b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -37,8 +37,6 @@ endif
if build_docs
SPHINX_ARGS += ['-Dversion=' + meson.project_version(), '-Drelease=' + config_host['PKGVERSION']]
- have_ga = have_tools and config_host.has_key('CONFIG_GUEST_AGENT')
-
man_pages = {
'qemu-ga.8': (have_ga ? 'man8' : ''),
'qemu-ga-ref.7': (have_ga ? 'man7' : ''),
diff --git a/meson.build b/meson.build
index 7fc2e3179e..ae7a21c841 100644
--- a/meson.build
+++ b/meson.build
@@ -44,21 +44,7 @@ config_host_data = configuration_data()
genh = []
qapi_trace_events = []
-target_dirs = config_host['TARGET_DIRS'].split()
-have_linux_user = false
-have_bsd_user = false
-have_system = false
-foreach target : target_dirs
- have_linux_user = have_linux_user or target.endswith('linux-user')
- have_bsd_user = have_bsd_user or target.endswith('bsd-user')
- have_system = have_system or target.endswith('-softmmu')
-endforeach
-have_user = have_linux_user or have_bsd_user
-have_tools = 'CONFIG_TOOLS' in config_host
-have_block = have_system or have_tools
-
-python = import('python').find_installation()
-
+bsd_oses = ['gnu/kfreebsd', 'freebsd', 'netbsd', 'openbsd', 'dragonfly', 'darwin']
supported_oses = ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', 'sunos', 'linux']
supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv', 'x86', 'x86_64',
'arm', 'aarch64', 'loongarch64', 'mips', 'mips64', 'sparc', 'sparc64']
@@ -72,6 +58,28 @@ endif
targetos = host_machine.system()
+target_dirs = config_host['TARGET_DIRS'].split()
+have_linux_user = false
+have_bsd_user = false
+have_system = false
+foreach target : target_dirs
+ have_linux_user = have_linux_user or target.endswith('linux-user')
+ have_bsd_user = have_bsd_user or target.endswith('bsd-user')
+ have_system = have_system or target.endswith('-softmmu')
+endforeach
+have_user = have_linux_user or have_bsd_user
+have_tools = get_option('tools') \
+ .disable_auto_if(not have_system) \
+ .allowed()
+have_ga = get_option('guest_agent') \
+ .disable_auto_if(not have_system and not have_tools) \
+ .require(targetos in ['sunos', 'linux', 'windows'],
+ error_message: 'unsupported OS for QEMU guest agent') \
+ .allowed()
+have_block = have_system or have_tools
+
+python = import('python').find_installation()
+
if cpu not in supported_cpus
host_arch = 'unknown'
elif cpu == 'x86'
@@ -3218,11 +3226,7 @@ if 'CONFIG_PLUGIN' in config_host
install_headers('include/qemu/qemu-plugin.h')
endif
-if 'CONFIG_GUEST_AGENT' in config_host
- subdir('qga')
-elif get_option('guest_agent_msi').enabled()
- error('Guest agent MSI requested, but the guest agent is not being built')
-endif
+subdir('qga')
# Don't build qemu-keymap if xkbcommon is not explicitly enabled
# when we don't build tools or system
@@ -3345,7 +3349,7 @@ if config_host.has_key('HAVE_GDB_BIN')
summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
endif
summary_info += {'genisoimage': config_host['GENISOIMAGE']}
-if targetos == 'windows' and config_host.has_key('CONFIG_GUEST_AGENT')
+if targetos == 'windows' and have_ga
summary_info += {'wixl': wixl}
endif
if slirp_opt != 'disabled' and have_system
@@ -3383,7 +3387,7 @@ summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}
summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
-summary_info += {'build guest agent': config_host.has_key('CONFIG_GUEST_AGENT')}
+summary_info += {'build guest agent': have_ga}
summary(summary_info, bool_yn: true, section: 'Configurable features')
# Compilation information
@@ -3593,7 +3597,7 @@ summary_info += {'GBM': gbm}
summary_info += {'libiscsi support': libiscsi}
summary_info += {'libnfs support': libnfs}
if targetos == 'windows'
- if config_host.has_key('CONFIG_GUEST_AGENT')
+ if have_ga
summary_info += {'QGA VSS support': config_host.has_key('CONFIG_QGA_VSS')}
summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
endif
diff --git a/meson_options.txt b/meson_options.txt
index 59220b52c8..589d242439 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -36,8 +36,12 @@ option('install_blobs', type : 'boolean', value : true,
description: 'install provided firmware blobs')
option('sparse', type : 'feature', value : 'auto',
description: 'sparse checker')
+option('guest_agent', type : 'feature', value : 'auto',
+ description: 'Build QEMU Guest Agent')
option('guest_agent_msi', type : 'feature', value : 'auto',
description: 'Build MSI package for the QEMU Guest Agent')
+option('tools', type : 'feature', value : 'auto',
+ description: 'build support utilities that come with QEMU')
option('malloc_trim', type : 'feature', value : 'auto',
description: 'enable libc malloc_trim() for memory optimization')
diff --git a/qga/meson.build b/qga/meson.build
index 56fb6539e5..97cc391fe1 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -1,3 +1,10 @@
+if not have_ga
+ if get_option('guest_agent_msi').enabled()
+ error('Guest agent MSI requested, but the guest agent is not being built')
+ endif
+ subdir_done()
+endif
+
all_qga = []
qga_qapi_outputs = [
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 07c1243b3f..8c943f6c2a 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -62,6 +62,7 @@ meson_options_help() {
printf "%s\n" ' glusterfs Glusterfs block device driver'
printf "%s\n" ' gnutls GNUTLS cryptography support'
printf "%s\n" ' gtk GTK+ user interface'
+ printf "%s\n" ' guest-agent Build QEMU Guest Agent'
printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Agent'
printf "%s\n" ' hax HAX acceleration support'
printf "%s\n" ' hvf HVF acceleration support'
@@ -109,6 +110,7 @@ meson_options_help() {
printf "%s\n" ' spice Spice server support'
printf "%s\n" ' spice-protocol Spice protocol support'
printf "%s\n" ' tcg TCG support'
+ printf "%s\n" ' tools build support utilities that come with QEMU'
printf "%s\n" ' tpm TPM support'
printf "%s\n" ' u2f U2F emulation support'
printf "%s\n" ' usb-redir libusbredir support'
@@ -210,6 +212,8 @@ _meson_option_parse() {
--disable-gprof) printf "%s" -Dgprof=false ;;
--enable-gtk) printf "%s" -Dgtk=enabled ;;
--disable-gtk) printf "%s" -Dgtk=disabled ;;
+ --enable-guest-agent) printf "%s" -Dguest_agent=enabled ;;
+ --disable-guest-agent) printf "%s" -Dguest_agent=disabled ;;
--enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;;
--disable-guest-agent-msi) printf "%s" -Dguest_agent_msi=disabled ;;
--enable-hax) printf "%s" -Dhax=enabled ;;
@@ -318,6 +322,8 @@ _meson_option_parse() {
--disable-tcg) printf "%s" -Dtcg=disabled ;;
--enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=true ;;
--disable-tcg-interpreter) printf "%s" -Dtcg_interpreter=false ;;
+ --enable-tools) printf "%s" -Dtools=enabled ;;
+ --disable-tools) printf "%s" -Dtools=disabled ;;
--enable-tpm) printf "%s" -Dtpm=enabled ;;
--disable-tpm) printf "%s" -Dtpm=disabled ;;
--enable-trace-backends=*) quote_sh "-Dtrace_backends=$2" ;;
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9157a57b1a..bbcf6bf049 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -154,7 +154,7 @@ check-acceptance: check-acceptance-deprecated-warning | check-avocado
.PHONY: check-block check check-clean get-vm-images
check:
-ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy)
+ifneq ($(.check-block.deps),)
check: check-block
check-block: run-ninja
$(if $(MAKE.n),,+)$(MESON) test $(MTESTARGS) $(.mtestargs) --verbose \
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 0959061faf..3a51759ebc 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -149,9 +149,7 @@ if have_system
endif
endif
-if 'CONFIG_TSAN' not in config_host and \
- 'CONFIG_GUEST_AGENT' in config_host and \
- 'CONFIG_LINUX' in config_host
+if have_ga and targetos == 'linux' and 'CONFIG_TSAN' not in config_host
tests += {'test-qga': ['../qtest/libqtest.c']}
test_deps += {'test-qga': qga}
endif
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 16/27] meson: refine check for whether to look for virglrenderer
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (14 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 15/27] configure, meson: move guest-agent, tools to meson Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 17/27] configure, meson: move OpenGL check to meson Paolo Bonzini
` (10 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
The check should be performed even if !have_system, as long as there is some hope that
vhost-user-gpu will be built. Store into have_vhost_user_gpu whether vhost-user-gpu
will be built; we will also use the variable to decide whether to look for libepoxy.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/vhost-user-gpu/meson.build | 3 +--
meson.build | 5 ++++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build
index b4e26045da..c8883c2d8e 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -1,5 +1,4 @@
-if have_tools and virgl.found() and gbm.found() \
- and 'CONFIG_LINUX' in config_host and pixman.found()
+if have_vhost_user_gpu
executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'),
dependencies: [qemuutil, pixman, gbm, virgl, vhost_user, opengl],
install: true,
diff --git a/meson.build b/meson.build
index ae7a21c841..894b9bd6ed 100644
--- a/meson.build
+++ b/meson.build
@@ -621,7 +621,9 @@ if not get_option('zstd').auto() or have_block
method: 'pkg-config', kwargs: static_kwargs)
endif
virgl = not_found
-if not get_option('virglrenderer').auto() or have_system
+
+have_vhost_user_gpu = have_tools and targetos == 'linux' and pixman.found()
+if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu
virgl = dependency('virglrenderer',
method: 'pkg-config',
required: get_option('virglrenderer'),
@@ -1000,6 +1002,7 @@ if (have_system or have_tools) and (virgl.found() or opengl.found())
gbm = dependency('gbm', method: 'pkg-config', required: false,
kwargs: static_kwargs)
endif
+have_vhost_user_gpu = have_vhost_user_gpu and virgl.found() and gbm.found()
gnutls = not_found
gnutls_crypto = not_found
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 17/27] configure, meson: move OpenGL check to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (15 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 16/27] meson: refine check for whether to look for virglrenderer Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 18/27] qga/vss-win32: fix midl arguments Paolo Bonzini
` (9 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 40 -----------------------------------
meson.build | 16 +++++++++-----
meson_options.txt | 2 ++
scripts/meson-buildoptions.sh | 3 +++
ui/meson.build | 16 +++++++-------
5 files changed, 24 insertions(+), 53 deletions(-)
diff --git a/configure b/configure
index 8ab1e96835..e25de48b3e 100755
--- a/configure
+++ b/configure
@@ -316,7 +316,6 @@ pkgversion=""
pie=""
trace_backends="log"
trace_file="trace"
-opengl="$default_feature"
vss_win32_sdk="$default_feature"
win_sdk="no"
coroutine=""
@@ -952,10 +951,6 @@ for opt do
;;
--enable-vhost-user-fs) vhost_user_fs="yes"
;;
- --disable-opengl) opengl="no"
- ;;
- --enable-opengl) opengl="yes"
- ;;
--disable-zlib-test)
;;
--with-vss-sdk) vss_win32_sdk=""
@@ -1277,7 +1272,6 @@ cat << EOF
vhost-kernel vhost kernel backend support
vhost-user vhost-user backend support
vhost-vdpa vhost-vdpa kernel backend support
- opengl opengl support
gio libgio support
NOTE: The object files are built at the place where configure is launched
@@ -2287,34 +2281,6 @@ case "$fdt" in
esac
##########################################
-# opengl probe (for sdl2, gtk)
-
-if test "$opengl" != "no" ; then
- epoxy=no
- if $pkg_config epoxy; then
- cat > $TMPC << EOF
-#include <epoxy/egl.h>
-int main(void) { return 0; }
-EOF
- if compile_prog "" "" ; then
- epoxy=yes
- fi
- fi
-
- if test "$epoxy" = "yes" ; then
- opengl_cflags="$($pkg_config --cflags epoxy)"
- opengl_libs="$($pkg_config --libs epoxy)"
- opengl=yes
- else
- if test "$opengl" = "yes" ; then
- feature_not_found "opengl" "Please install epoxy with EGL"
- fi
- opengl_cflags=""
- opengl_libs=""
- opengl=no
- fi
-fi
-
# check for usbfs
have_usbfs=no
if test "$linux_user" = "yes"; then
@@ -3024,12 +2990,6 @@ if test "$tcg" = "enabled" -a "$tcg_interpreter" = "true" ; then
echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak
fi
-if test "$opengl" = "yes" ; then
- echo "CONFIG_OPENGL=y" >> $config_host_mak
- echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak
- echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
-fi
-
# XXX: suppress that
if [ "$bsd" = "yes" ] ; then
echo "CONFIG_BSD=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 894b9bd6ed..c4601554a5 100644
--- a/meson.build
+++ b/meson.build
@@ -993,9 +993,14 @@ if not get_option('coreaudio').auto() or (targetos == 'darwin' and have_system)
endif
opengl = not_found
-if 'CONFIG_OPENGL' in config_host
- opengl = declare_dependency(compile_args: config_host['OPENGL_CFLAGS'].split(),
- link_args: config_host['OPENGL_LIBS'].split())
+if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
+ epoxy = dependency('epoxy', method: 'pkg-config',
+ required: get_option('opengl'), kwargs: static_kwargs)
+ if cc.has_header('epoxy/egl.h', dependencies: epoxy)
+ opengl = epoxy
+ elif get_option('dsound').enabled()
+ error('epoxy/egl.h not found')
+ endif
endif
gbm = not_found
if (have_system or have_tools) and (virgl.found() or opengl.found())
@@ -1521,6 +1526,7 @@ config_host_data.set('CONFIG_LINUX_AIO', libaio.found())
config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
config_host_data.set('CONFIG_NUMA', numa.found())
+config_host_data.set('CONFIG_OPENGL', opengl.found())
config_host_data.set('CONFIG_PROFILER', get_option('profiler'))
config_host_data.set('CONFIG_RBD', rbd.found())
config_host_data.set('CONFIG_SDL', sdl.found())
@@ -1994,7 +2000,7 @@ host_kconfig = \
(have_tpm ? ['CONFIG_TPM=y'] : []) + \
(spice.found() ? ['CONFIG_SPICE=y'] : []) + \
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
- ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \
+ (opengl.found() ? ['CONFIG_OPENGL=y'] : []) + \
(x11.found() ? ['CONFIG_X11=y'] : []) + \
('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \
('CONFIG_VHOST_VDPA' in config_host ? ['CONFIG_VHOST_VDPA=y'] : []) + \
@@ -3595,7 +3601,7 @@ summary_info += {'smartcard support': cacard}
summary_info += {'U2F support': u2f}
summary_info += {'libusb': libusb}
summary_info += {'usb net redir': usbredir}
-summary_info += {'OpenGL support': config_host.has_key('CONFIG_OPENGL')}
+summary_info += {'OpenGL support (epoxy)': opengl}
summary_info += {'GBM': gbm}
summary_info += {'libiscsi support': libiscsi}
summary_info += {'libnfs support': libnfs}
diff --git a/meson_options.txt b/meson_options.txt
index 589d242439..417b543314 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -145,6 +145,8 @@ option('lzo', type : 'feature', value : 'auto',
description: 'lzo compression support')
option('rbd', type : 'feature', value : 'auto',
description: 'Ceph block device driver')
+option('opengl', type : 'feature', value : 'auto',
+ description: 'OpenGL support')
option('gtk', type : 'feature', value : 'auto',
description: 'GTK+ user interface')
option('sdl', type : 'feature', value : 'auto',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 8c943f6c2a..895d8310b4 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -92,6 +92,7 @@ meson_options_help() {
printf "%s\n" ' nettle nettle cryptography support'
printf "%s\n" ' numa libnuma support'
printf "%s\n" ' nvmm NVMM acceleration support'
+ printf "%s\n" ' opengl OpenGL support'
printf "%s\n" ' oss OSS sound support'
printf "%s\n" ' pa PulseAudio sound support'
printf "%s\n" ' parallels parallels image format support'
@@ -273,6 +274,8 @@ _meson_option_parse() {
--disable-numa) printf "%s" -Dnuma=disabled ;;
--enable-nvmm) printf "%s" -Dnvmm=enabled ;;
--disable-nvmm) printf "%s" -Dnvmm=disabled ;;
+ --enable-opengl) printf "%s" -Dopengl=enabled ;;
+ --disable-opengl) printf "%s" -Dopengl=disabled ;;
--enable-oss) printf "%s" -Doss=enabled ;;
--disable-oss) printf "%s" -Doss=disabled ;;
--enable-pa) printf "%s" -Dpa=enabled ;;
diff --git a/ui/meson.build b/ui/meson.build
index 64286ba150..cdf2bafb03 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -43,7 +43,6 @@ vnc_ss.add(zlib, png, jpeg, gnutls)
vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
-specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)
ui_modules = {}
@@ -53,17 +52,18 @@ if curses.found()
ui_modules += {'curses' : curses_ss}
endif
-if config_host.has_key('CONFIG_OPENGL')
+softmmu_ss.add(opengl)
+if opengl.found()
opengl_ss = ss.source_set()
opengl_ss.add(gbm)
- opengl_ss.add(when: [opengl, pixman, 'CONFIG_OPENGL'],
+ opengl_ss.add(when: [opengl, pixman],
if_true: files('shader.c', 'console-gl.c', 'egl-helpers.c', 'egl-context.c'))
ui_modules += {'opengl' : opengl_ss}
endif
-if config_host.has_key('CONFIG_OPENGL') and gbm.found()
+if opengl.found() and gbm.found()
egl_headless_ss = ss.source_set()
- egl_headless_ss.add(when: [opengl, gbm, pixman, 'CONFIG_OPENGL'],
+ egl_headless_ss.add(when: [opengl, gbm, pixman],
if_true: files('egl-headless.c'))
ui_modules += {'egl-headless' : egl_headless_ss}
endif
@@ -98,8 +98,8 @@ if gtk.found()
gtk_ss = ss.source_set()
gtk_ss.add(gtk, vte, pixman, files('gtk.c', 'gtk-clipboard.c'))
gtk_ss.add(when: x11, if_true: files('x_keymap.c'))
- gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-gl-area.c'))
- gtk_ss.add(when: [x11, opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c'))
+ gtk_ss.add(when: opengl, if_true: files('gtk-gl-area.c'))
+ gtk_ss.add(when: [x11, opengl], if_true: files('gtk-egl.c'))
ui_modules += {'gtk' : gtk_ss}
endif
@@ -112,7 +112,7 @@ if sdl.found()
'sdl2-input.c',
'sdl2.c',
))
- sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c'))
+ sdl_ss.add(when: opengl, if_true: files('sdl2-gl.c'))
sdl_ss.add(when: x11, if_true: files('x_keymap.c'))
ui_modules += {'sdl' : sdl_ss}
endif
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 18/27] qga/vss-win32: fix midl arguments
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (16 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 17/27] configure, meson: move OpenGL check to meson Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-08 11:13 ` Konstantin Kostiuk
2022-02-03 17:33 ` [PATCH 19/27] meson: drop --with-win-sdk Paolo Bonzini
` (8 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Microsoft midl compiler doesn't take "-options" form, nor does it take
OUTPUT filename. The -I option seems needless as well (at least with
VS15).
It's not clear what was actually used when it was introduced in commit
b39297aedfabe9.
strings says "Created by MIDL version 7.00.0555 at Fri Dec 21 13:36:39
2012".
I doubt the makefile rule actually ever worked.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/vss-win32/meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 90825edef3..78bdf5e74a 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -26,8 +26,7 @@ if midl.found()
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.idl',
output: 'qga-vss.tlb',
- command: [midl, '-tlb', '-I' + config_host['WIN_SDK'],
- '@INPUT@', '@OUTPUT@'])
+ command: [midl, '@INPUT@', '/tlb', '@OUTPUT@'])
else
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.tlb',
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 18/27] qga/vss-win32: fix midl arguments
2022-02-03 17:33 ` [PATCH 18/27] qga/vss-win32: fix midl arguments Paolo Bonzini
@ 2022-02-08 11:13 ` Konstantin Kostiuk
2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:13 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Thu, Feb 3, 2022 at 8:16 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Microsoft midl compiler doesn't take "-options" form, nor does it take
> OUTPUT filename. The -I option seems needless as well (at least with
> VS15).
>
> It's not clear what was actually used when it was introduced in commit
> b39297aedfabe9.
>
> strings says "Created by MIDL version 7.00.0555 at Fri Dec 21 13:36:39
> 2012".
>
> I doubt the makefile rule actually ever worked.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> qga/vss-win32/meson.build | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
> index 90825edef3..78bdf5e74a 100644
> --- a/qga/vss-win32/meson.build
> +++ b/qga/vss-win32/meson.build
> @@ -26,8 +26,7 @@ if midl.found()
> gen_tlb = custom_target('gen-tlb',
> input: 'qga-vss.idl',
> output: 'qga-vss.tlb',
> - command: [midl, '-tlb', '-I' +
> config_host['WIN_SDK'],
> - '@INPUT@', '@OUTPUT@'])
> + command: [midl, '@INPUT@', '/tlb', '@OUTPUT@'])
> else
> gen_tlb = custom_target('gen-tlb',
> input: 'qga-vss.tlb',
> --
> 2.34.1
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 2510 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [PATCH 18/27] qga/vss-win32: fix midl arguments
2022-02-08 11:13 ` Konstantin Kostiuk
@ 2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:20 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Tue, Feb 8, 2022 at 1:13 PM Konstantin Kostiuk <kkostiuk@redhat.com>
wrote:
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
>
>
>
> On Thu, Feb 3, 2022 at 8:16 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Microsoft midl compiler doesn't take "-options" form, nor does it take
>> OUTPUT filename. The -I option seems needless as well (at least with
>> VS15).
>>
>> It's not clear what was actually used when it was introduced in commit
>> b39297aedfabe9.
>>
>> strings says "Created by MIDL version 7.00.0555 at Fri Dec 21 13:36:39
>> 2012".
>>
>> I doubt the makefile rule actually ever worked.
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> qga/vss-win32/meson.build | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
>> index 90825edef3..78bdf5e74a 100644
>> --- a/qga/vss-win32/meson.build
>> +++ b/qga/vss-win32/meson.build
>> @@ -26,8 +26,7 @@ if midl.found()
>> gen_tlb = custom_target('gen-tlb',
>> input: 'qga-vss.idl',
>> output: 'qga-vss.tlb',
>> - command: [midl, '-tlb', '-I' +
>> config_host['WIN_SDK'],
>> - '@INPUT@', '@OUTPUT@'])
>> + command: [midl, '@INPUT@', '/tlb', '@OUTPUT@
>> '])
>> else
>> gen_tlb = custom_target('gen-tlb',
>> input: 'qga-vss.tlb',
>> --
>> 2.34.1
>>
>>
>>
>>
[-- Attachment #2: Type: text/html, Size: 2962 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 19/27] meson: drop --with-win-sdk
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (17 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 18/27] qga/vss-win32: fix midl arguments Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 17:33 ` [PATCH 20/27] qga/vss-win32: use widl if available Paolo Bonzini
` (7 subsequent siblings)
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
It's no longer used.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 29 -----------------------------
meson.build | 5 -----
2 files changed, 34 deletions(-)
diff --git a/configure b/configure
index e25de48b3e..3fb28891d3 100755
--- a/configure
+++ b/configure
@@ -317,7 +317,6 @@ pie=""
trace_backends="log"
trace_file="trace"
vss_win32_sdk="$default_feature"
-win_sdk="no"
coroutine=""
tls_priority="NORMAL"
plugins="$default_feature"
@@ -959,12 +958,6 @@ for opt do
;;
--without-vss-sdk) vss_win32_sdk="no"
;;
- --with-win-sdk) win_sdk=""
- ;;
- --with-win-sdk=*) win_sdk="$optarg"
- ;;
- --without-win-sdk) win_sdk="no"
- ;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
@@ -2340,27 +2333,6 @@ EOF
fi
fi
-##########################################
-# lookup Windows platform SDK (if not specified)
-# The SDK is needed only to build .tlb (type library) file of guest agent
-# VSS provider from the source. It is usually unnecessary because the
-# pre-compiled .tlb file is included.
-
-if test "$mingw32" = "yes" && \
- test "$guest_agent_with_vss" = "yes" ; then
- if test -z "$win_sdk"; then
- programfiles="$PROGRAMFILES"
- test -n "$PROGRAMW6432" && programfiles="$PROGRAMW6432"
- if test -n "$programfiles"; then
- win_sdk=$(ls -d "$programfiles/Microsoft SDKs/Windows/v"* | tail -1) 2>/dev/null
- else
- feature_not_found "Windows SDK"
- fi
- elif test "$win_sdk" = "no"; then
- win_sdk=""
- fi
-fi
-
##########################################
# check if mingw environment provides a recent ntddscsi.h
guest_agent_ntddscsi="no"
@@ -2892,7 +2864,6 @@ if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
if test "$guest_agent_with_vss" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak
- echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
fi
if test "$guest_agent_ntddscsi" = "yes" ; then
echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index c4601554a5..e1667954b9 100644
--- a/meson.build
+++ b/meson.build
@@ -3413,11 +3413,6 @@ endif
if targetos == 'darwin'
summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())}
endif
-if targetos == 'windows'
- if 'WIN_SDK' in config_host
- summary_info += {'Windows SDK': config_host['WIN_SDK']}
- endif
-endif
summary_info += {'CFLAGS': ' '.join(get_option('c_args')
+ ['-O' + get_option('optimization')]
+ (get_option('debug') ? ['-g'] : []))}
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* [PATCH 20/27] qga/vss-win32: use widl if available
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (18 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 19/27] meson: drop --with-win-sdk Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-08 11:14 ` Konstantin Kostiuk
2022-02-03 17:33 ` [PATCH 21/27] qga/vss: use standard windows headers location Paolo Bonzini
` (6 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
widl from mingw64-tools and wine can compile a TLB file.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/vss-win32/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 78bdf5e74a..8f3aff5fe3 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -18,15 +18,18 @@ if add_languages('cpp', required: false)
all_qga += qga_vss
endif
-# rules to build qga-vss.tlb
-# Currently, only native build is supported because building .tlb
-# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in VC++).
midl = find_program('midl', required: false)
+widl = find_program('widl', required: false)
if midl.found()
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.idl',
output: 'qga-vss.tlb',
command: [midl, '@INPUT@', '/tlb', '@OUTPUT@'])
+elif widl.found()
+ gen_tlb = custom_target('gen-tlb',
+ input: 'qga-vss.idl',
+ output: 'qga-vss.tlb',
+ command: [widl, '-t', '@INPUT@', '-o', '@OUTPUT@'])
else
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.tlb',
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 20/27] qga/vss-win32: use widl if available
2022-02-03 17:33 ` [PATCH 20/27] qga/vss-win32: use widl if available Paolo Bonzini
@ 2022-02-08 11:14 ` Konstantin Kostiuk
2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:14 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Thu, Feb 3, 2022 at 8:08 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> widl from mingw64-tools and wine can compile a TLB file.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> qga/vss-win32/meson.build | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
> index 78bdf5e74a..8f3aff5fe3 100644
> --- a/qga/vss-win32/meson.build
> +++ b/qga/vss-win32/meson.build
> @@ -18,15 +18,18 @@ if add_languages('cpp', required: false)
> all_qga += qga_vss
> endif
>
> -# rules to build qga-vss.tlb
> -# Currently, only native build is supported because building .tlb
> -# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in
> VC++).
> midl = find_program('midl', required: false)
> +widl = find_program('widl', required: false)
> if midl.found()
> gen_tlb = custom_target('gen-tlb',
> input: 'qga-vss.idl',
> output: 'qga-vss.tlb',
> command: [midl, '@INPUT@', '/tlb', '@OUTPUT@'])
> +elif widl.found()
> + gen_tlb = custom_target('gen-tlb',
> + input: 'qga-vss.idl',
> + output: 'qga-vss.tlb',
> + command: [widl, '-t', '@INPUT@', '-o',
> '@OUTPUT@'])
> else
> gen_tlb = custom_target('gen-tlb',
> input: 'qga-vss.tlb',
> --
> 2.34.1
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 2540 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [PATCH 20/27] qga/vss-win32: use widl if available
2022-02-08 11:14 ` Konstantin Kostiuk
@ 2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:20 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1875 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Tue, Feb 8, 2022 at 1:14 PM Konstantin Kostiuk <kkostiuk@redhat.com>
wrote:
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
>
> On Thu, Feb 3, 2022 at 8:08 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> widl from mingw64-tools and wine can compile a TLB file.
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> qga/vss-win32/meson.build | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
>> index 78bdf5e74a..8f3aff5fe3 100644
>> --- a/qga/vss-win32/meson.build
>> +++ b/qga/vss-win32/meson.build
>> @@ -18,15 +18,18 @@ if add_languages('cpp', required: false)
>> all_qga += qga_vss
>> endif
>>
>> -# rules to build qga-vss.tlb
>> -# Currently, only native build is supported because building .tlb
>> -# (TypeLibrary) from .idl requires WindowsSDK and MIDL (and cl.exe in
>> VC++).
>> midl = find_program('midl', required: false)
>> +widl = find_program('widl', required: false)
>> if midl.found()
>> gen_tlb = custom_target('gen-tlb',
>> input: 'qga-vss.idl',
>> output: 'qga-vss.tlb',
>> command: [midl, '@INPUT@', '/tlb', '@OUTPUT@
>> '])
>> +elif widl.found()
>> + gen_tlb = custom_target('gen-tlb',
>> + input: 'qga-vss.idl',
>> + output: 'qga-vss.tlb',
>> + command: [widl, '-t', '@INPUT@', '-o',
>> '@OUTPUT@'])
>> else
>> gen_tlb = custom_target('gen-tlb',
>> input: 'qga-vss.tlb',
>> --
>> 2.34.1
>>
>>
>>
>>
[-- Attachment #2: Type: text/html, Size: 3049 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 21/27] qga/vss: use standard windows headers location
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (19 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 20/27] qga/vss-win32: use widl if available Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-04 5:16 ` Philippe Mathieu-Daudé via
2022-02-03 17:33 ` [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk Paolo Bonzini
` (5 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Stop using special paths with outdated headers from an old SDK.
Instead, use standard include paths.
You can still build against the old SDK by running configure with
--extra-cxxflags="-isystem `/path/to/inc/win2003/"
(this also allows to build against MinGW headers, which are currently
broken as in 9.0)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/vss-win32/install.cpp | 2 +-
qga/vss-win32/provider.cpp | 4 ++--
qga/vss-win32/requester.cpp | 4 ++--
qga/vss-win32/vss-common.h | 6 +-----
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
index 40de133774..efc5bb9909 100644
--- a/qga/vss-win32/install.cpp
+++ b/qga/vss-win32/install.cpp
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "vss-common.h"
-#include <inc/win2003/vscoordint.h>
+#include <vscoordint.h>
#include "install.h"
#include <wbemidl.h>
#include <comdef.h>
diff --git a/qga/vss-win32/provider.cpp b/qga/vss-win32/provider.cpp
index 72d8b0e19d..fd187fb66f 100644
--- a/qga/vss-win32/provider.cpp
+++ b/qga/vss-win32/provider.cpp
@@ -12,8 +12,8 @@
#include "qemu/osdep.h"
#include "vss-common.h"
-#include <inc/win2003/vscoordint.h>
-#include <inc/win2003/vsprov.h>
+#include <vscoordint.h>
+#include <vsprov.h>
#define VSS_TIMEOUT_MSEC (60*1000)
diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp
index 940a2c8f55..4513324dd2 100644
--- a/qga/vss-win32/requester.cpp
+++ b/qga/vss-win32/requester.cpp
@@ -14,8 +14,8 @@
#include "vss-common.h"
#include "requester.h"
#include "install.h"
-#include <inc/win2003/vswriter.h>
-#include <inc/win2003/vsbackup.h>
+#include <vswriter.h>
+#include <vsbackup.h>
/* Max wait time for frozen event (VSS can only hold writes for 10 seconds) */
#define VSS_TIMEOUT_FREEZE_MSEC 60000
diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h
index 61c170b52e..54f8de8c88 100644
--- a/qga/vss-win32/vss-common.h
+++ b/qga/vss-win32/vss-common.h
@@ -46,11 +46,7 @@
#undef VSS_E_MAXIMUM_NUMBER_OF_VOLUMES_REACHED
#undef VSS_E_MAXIMUM_NUMBER_OF_SNAPSHOTS_REACHED
-/*
- * VSS headers must be installed from Microsoft VSS SDK 7.2 available at:
- * http://www.microsoft.com/en-us/download/details.aspx?id=23490
- */
-#include <inc/win2003/vss.h>
+#include <vss.h>
#include "vss-handles.h"
/* Macros to convert char definitions to wchar */
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 21/27] qga/vss: use standard windows headers location
2022-02-03 17:33 ` [PATCH 21/27] qga/vss: use standard windows headers location Paolo Bonzini
@ 2022-02-04 5:16 ` Philippe Mathieu-Daudé via
2022-02-08 11:21 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-02-04 5:16 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: marcandre.lureau
On 3/2/22 18:33, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Stop using special paths with outdated headers from an old SDK.
>
> Instead, use standard include paths.
>
> You can still build against the old SDK by running configure with
> --extra-cxxflags="-isystem `/path/to/inc/win2003/"
Superfluous back quote.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> (this also allows to build against MinGW headers, which are currently
> broken as in 9.0)
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> qga/vss-win32/install.cpp | 2 +-
> qga/vss-win32/provider.cpp | 4 ++--
> qga/vss-win32/requester.cpp | 4 ++--
> qga/vss-win32/vss-common.h | 6 +-----
> 4 files changed, 6 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 21/27] qga/vss: use standard windows headers location
2022-02-04 5:16 ` Philippe Mathieu-Daudé via
@ 2022-02-08 11:21 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:21 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, qemu-devel, Marc-André Lureau
[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Fri, Feb 4, 2022 at 7:18 AM Philippe Mathieu-Daudé via <
qemu-devel@nongnu.org> wrote:
> On 3/2/22 18:33, Paolo Bonzini wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > Stop using special paths with outdated headers from an old SDK.
> >
> > Instead, use standard include paths.
> >
> > You can still build against the old SDK by running configure with
> > --extra-cxxflags="-isystem `/path/to/inc/win2003/"
>
> Superfluous back quote.
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> > (this also allows to build against MinGW headers, which are currently
> > broken as in 9.0)
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > qga/vss-win32/install.cpp | 2 +-
> > qga/vss-win32/provider.cpp | 4 ++--
> > qga/vss-win32/requester.cpp | 4 ++--
> > qga/vss-win32/vss-common.h | 6 +-----
> > 4 files changed, 6 insertions(+), 10 deletions(-)
>
>
[-- Attachment #2: Type: text/html, Size: 1816 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (20 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 21/27] qga/vss: use standard windows headers location Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-03 18:07 ` Marc-André Lureau
2022-02-03 17:33 ` [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence Paolo Bonzini
` (4 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The VSS headers are part of standard MS VS SDK, at least since version
15, and probably before that.
They are also included with MinGW, although currently broken.
Let's streamline a bit the options, by not making it so special, and
instead rely on proper system headers configuration or user
--extra-cxxflags. This still requires some extra step to cross-build
with MinGW as described in the meson.build file now.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Use a "feature"-type option. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 47 -----------------------------------
meson.build | 10 +++++++-
meson_options.txt | 2 ++
qga/meson.build | 21 ++++++++++++++--
scripts/meson-buildoptions.sh | 3 +++
5 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/configure b/configure
index 3fb28891d3..f67088044f 100755
--- a/configure
+++ b/configure
@@ -316,7 +316,6 @@ pkgversion=""
pie=""
trace_backends="log"
trace_file="trace"
-vss_win32_sdk="$default_feature"
coroutine=""
tls_priority="NORMAL"
plugins="$default_feature"
@@ -952,12 +951,6 @@ for opt do
;;
--disable-zlib-test)
;;
- --with-vss-sdk) vss_win32_sdk=""
- ;;
- --with-vss-sdk=*) vss_win32_sdk="$optarg"
- ;;
- --without-vss-sdk) vss_win32_sdk="no"
- ;;
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
@@ -1234,8 +1227,6 @@ Advanced options (experts only):
--with-coroutine=BACKEND coroutine backend. Supported options:
ucontext, sigaltstack, windows
--enable-gcov enable test coverage analysis with gcov
- --with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
- --with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb)
--tls-priority default TLS protocol/cipher priority string
--enable-plugins
enable plugins via shared library loading
@@ -2298,41 +2289,6 @@ EOF
fi
fi
-##########################################
-# check if we have VSS SDK headers for win
-
-guest_agent_with_vss="no"
-if test "$mingw32" = "yes" && \
- test "$vss_win32_sdk" != "no" ; then
- case "$vss_win32_sdk" in
- "") vss_win32_include="-isystem $source_path" ;;
- *\ *) # The SDK is installed in "Program Files" by default, but we cannot
- # handle path with spaces. So we symlink the headers into ".sdk/vss".
- vss_win32_include="-isystem $source_path/.sdk/vss"
- symlink "$vss_win32_sdk/inc" "$source_path/.sdk/vss/inc"
- ;;
- *) vss_win32_include="-isystem $vss_win32_sdk"
- esac
- cat > $TMPC << EOF
-#define __MIDL_user_allocate_free_DEFINED__
-#include <inc/win2003/vss.h>
-int main(void) { return VSS_CTX_BACKUP; }
-EOF
- if compile_prog "$vss_win32_include" "" ; then
- guest_agent_with_vss="yes"
- QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
- else
- if test "$vss_win32_sdk" != "" ; then
- echo "ERROR: Please download and install Microsoft VSS SDK:"
- echo "ERROR: http://www.microsoft.com/en-us/download/details.aspx?id=23490"
- echo "ERROR: On POSIX-systems, you can extract the SDK headers by:"
- echo "ERROR: scripts/extract-vsssdk-headers setup.exe"
- echo "ERROR: The headers are extracted in the directory \`inc'."
- feature_not_found "VSS support"
- fi
- fi
-fi
-
##########################################
# check if mingw environment provides a recent ntddscsi.h
guest_agent_ntddscsi="no"
@@ -2862,9 +2818,6 @@ if test "$debug_tcg" = "yes" ; then
fi
if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
- if test "$guest_agent_with_vss" = "yes" ; then
- echo "CONFIG_QGA_VSS=y" >> $config_host_mak
- fi
if test "$guest_agent_ntddscsi" = "yes" ; then
echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
fi
diff --git a/meson.build b/meson.build
index e1667954b9..e3499a7e9a 100644
--- a/meson.build
+++ b/meson.build
@@ -1932,6 +1932,14 @@ config_host_data.set('CONFIG_AF_VSOCK', cc.compiles(gnu_source_prefix + '''
return -1;
}'''))
+have_vss = false
+if targetos == 'windows' and link_language == 'cpp'
+ have_vss = cxx.compiles('''
+ #define __MIDL_user_allocate_free_DEFINED__
+ #include <inc/win2003/vss.h>
+ int main(void) { return VSS_CTX_BACKUP; }''')
+endif
+
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
'HAVE_GDB_BIN']
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
@@ -3602,7 +3610,7 @@ summary_info += {'libiscsi support': libiscsi}
summary_info += {'libnfs support': libnfs}
if targetos == 'windows'
if have_ga
- summary_info += {'QGA VSS support': config_host.has_key('CONFIG_QGA_VSS')}
+ summary_info += {'QGA VSS support': have_qga_vss}
summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
endif
endif
diff --git a/meson_options.txt b/meson_options.txt
index 417b543314..aad337592d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -42,6 +42,8 @@ option('guest_agent_msi', type : 'feature', value : 'auto',
description: 'Build MSI package for the QEMU Guest Agent')
option('tools', type : 'feature', value : 'auto',
description: 'build support utilities that come with QEMU')
+option('qga_vss', type : 'feature', value: 'auto',
+ description: 'build QGA VSS support (broken with MinGW)')
option('malloc_trim', type : 'feature', value : 'auto',
description: 'enable libc malloc_trim() for memory optimization')
diff --git a/qga/meson.build b/qga/meson.build
index 97cc391fe1..ca795f44fb 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -2,9 +2,26 @@ if not have_ga
if get_option('guest_agent_msi').enabled()
error('Guest agent MSI requested, but the guest agent is not being built')
endif
+ have_qga_vss = false
subdir_done()
endif
+have_qga_vss = get_option('qga_vss') \
+ .require(targetos == 'windows',
+ error_message: 'VSS support requires Windows') \
+ .require(link_language == 'cpp',
+ error_message: 'VSS support requires a C++ compiler') \
+ .require(have_vss, error_message: '''VSS support requires VSS headers.
+ If your Visual Studio installation doesn't have the VSS headers,
+ Please download and install Microsoft VSS SDK:
+ http://www.microsoft.com/en-us/download/details.aspx?id=23490
+ On POSIX-systems, MinGW doesn't yet provide working headers.
+ you can extract the SDK headers by:
+ $ scripts/extract-vsssdk-headers setup.exe
+ The headers are extracted in the directory \`inc'.
+ Then run configure with: --extra-cxxflags="-isystem /path/to/vss/inc"''') \
+ .allowed()
+
all_qga = []
qga_qapi_outputs = [
@@ -63,7 +80,7 @@ gen_tlb = []
qga_libs = []
if targetos == 'windows'
qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32']
- if 'CONFIG_QGA_VSS' in config_host
+ if have_qga_vss
qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup']
subdir('vss-win32')
endif
@@ -93,7 +110,7 @@ if targetos == 'windows'
if wixl.found()
deps = [gen_tlb, qga]
qemu_ga_msi_vss = []
- if 'CONFIG_QGA_VSS' in config_host
+ if have_qga_vss
qemu_ga_msi_vss = ['-D', 'InstallVss']
deps += qga_vss
endif
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index 895d8310b4..23de2a6c62 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -20,6 +20,7 @@ meson_options_help() {
printf "%s\n" ' --enable-malloc=CHOICE choose memory allocator to use [system] (choices:'
printf "%s\n" ' jemalloc/system/tcmalloc)'
printf "%s\n" ' --enable-profiler profiler support'
+ printf "%s\n" ' --enable-qga-vss build QGA VSS support'
printf "%s\n" ' --enable-qom-cast-debug cast debugging support'
printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u)random and'
printf "%s\n" ' getrandom()'
@@ -288,6 +289,8 @@ _meson_option_parse() {
--disable-qcow1) printf "%s" -Dqcow1=disabled ;;
--enable-qed) printf "%s" -Dqed=enabled ;;
--disable-qed) printf "%s" -Dqed=disabled ;;
+ --enable-qga-vss) printf "%s" -Dqga_vss=enabled ;;
+ --disable-qga-vss) printf "%s" -Dqga_vss=disabled ;;
--enable-qom-cast-debug) printf "%s" -Dqom_cast_debug=true ;;
--disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;;
--enable-rbd) printf "%s" -Drbd=enabled ;;
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk
2022-02-03 17:33 ` [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk Paolo Bonzini
@ 2022-02-03 18:07 ` Marc-André Lureau
0 siblings, 0 replies; 46+ messages in thread
From: Marc-André Lureau @ 2022-02-03 18:07 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU
[-- Attachment #1: Type: text/plain, Size: 9740 bytes --]
Hi
On Thu, Feb 3, 2022 at 10:02 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The VSS headers are part of standard MS VS SDK, at least since version
> 15, and probably before that.
>
> They are also included with MinGW, although currently broken.
>
> Let's streamline a bit the options, by not making it so special, and
> instead rely on proper system headers configuration or user
> --extra-cxxflags. This still requires some extra step to cross-build
> with MinGW as described in the meson.build file now.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> [Use a "feature"-type option. - Paolo]
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 47 -----------------------------------
> meson.build | 10 +++++++-
> meson_options.txt | 2 ++
> qga/meson.build | 21 ++++++++++++++--
> scripts/meson-buildoptions.sh | 3 +++
> 5 files changed, 33 insertions(+), 50 deletions(-)
>
> diff --git a/configure b/configure
> index 3fb28891d3..f67088044f 100755
> --- a/configure
> +++ b/configure
> @@ -316,7 +316,6 @@ pkgversion=""
> pie=""
> trace_backends="log"
> trace_file="trace"
> -vss_win32_sdk="$default_feature"
> coroutine=""
> tls_priority="NORMAL"
> plugins="$default_feature"
> @@ -952,12 +951,6 @@ for opt do
> ;;
> --disable-zlib-test)
> ;;
> - --with-vss-sdk) vss_win32_sdk=""
> - ;;
> - --with-vss-sdk=*) vss_win32_sdk="$optarg"
> - ;;
> - --without-vss-sdk) vss_win32_sdk="no"
> - ;;
> --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
> echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
> ;;
> @@ -1234,8 +1227,6 @@ Advanced options (experts only):
> --with-coroutine=BACKEND coroutine backend. Supported options:
> ucontext, sigaltstack, windows
> --enable-gcov enable test coverage analysis with gcov
> - --with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
> - --with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS
> .tlb)
> --tls-priority default TLS protocol/cipher priority string
> --enable-plugins
> enable plugins via shared library loading
> @@ -2298,41 +2289,6 @@ EOF
> fi
> fi
>
> -##########################################
> -# check if we have VSS SDK headers for win
> -
> -guest_agent_with_vss="no"
> -if test "$mingw32" = "yes" && \
> - test "$vss_win32_sdk" != "no" ; then
> - case "$vss_win32_sdk" in
> - "") vss_win32_include="-isystem $source_path" ;;
> - *\ *) # The SDK is installed in "Program Files" by default, but we
> cannot
> - # handle path with spaces. So we symlink the headers into
> ".sdk/vss".
> - vss_win32_include="-isystem $source_path/.sdk/vss"
> - symlink "$vss_win32_sdk/inc" "$source_path/.sdk/vss/inc"
> - ;;
> - *) vss_win32_include="-isystem $vss_win32_sdk"
> - esac
> - cat > $TMPC << EOF
> -#define __MIDL_user_allocate_free_DEFINED__
> -#include <inc/win2003/vss.h>
> -int main(void) { return VSS_CTX_BACKUP; }
> -EOF
> - if compile_prog "$vss_win32_include" "" ; then
> - guest_agent_with_vss="yes"
> - QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
> - else
> - if test "$vss_win32_sdk" != "" ; then
> - echo "ERROR: Please download and install Microsoft VSS SDK:"
> - echo "ERROR:
> http://www.microsoft.com/en-us/download/details.aspx?id=23490"
> - echo "ERROR: On POSIX-systems, you can extract the SDK headers by:"
> - echo "ERROR: scripts/extract-vsssdk-headers setup.exe"
> - echo "ERROR: The headers are extracted in the directory \`inc'."
> - feature_not_found "VSS support"
> - fi
> - fi
> -fi
> -
> ##########################################
> # check if mingw environment provides a recent ntddscsi.h
> guest_agent_ntddscsi="no"
> @@ -2862,9 +2818,6 @@ if test "$debug_tcg" = "yes" ; then
> fi
> if test "$mingw32" = "yes" ; then
> echo "CONFIG_WIN32=y" >> $config_host_mak
> - if test "$guest_agent_with_vss" = "yes" ; then
> - echo "CONFIG_QGA_VSS=y" >> $config_host_mak
> - fi
> if test "$guest_agent_ntddscsi" = "yes" ; then
> echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
> fi
> diff --git a/meson.build b/meson.build
> index e1667954b9..e3499a7e9a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1932,6 +1932,14 @@ config_host_data.set('CONFIG_AF_VSOCK',
> cc.compiles(gnu_source_prefix + '''
> return -1;
> }'''))
>
> +have_vss = false
> +if targetos == 'windows' and link_language == 'cpp'
> + have_vss = cxx.compiles('''
> + #define __MIDL_user_allocate_free_DEFINED__
> + #include <inc/win2003/vss.h>
>
Please check <vss.h> instead, this is the standard header location.
> + int main(void) { return VSS_CTX_BACKUP; }''')
> +endif
> +
> ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
> 'HAVE_GDB_BIN']
> arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
> @@ -3602,7 +3610,7 @@ summary_info += {'libiscsi support': libiscsi}
> summary_info += {'libnfs support': libnfs}
> if targetos == 'windows'
> if have_ga
> - summary_info += {'QGA VSS support':
> config_host.has_key('CONFIG_QGA_VSS')}
> + summary_info += {'QGA VSS support': have_qga_vss}
> summary_info += {'QGA w32 disk info':
> config_host.has_key('CONFIG_QGA_NTDDSCSI')}
> endif
> endif
> diff --git a/meson_options.txt b/meson_options.txt
> index 417b543314..aad337592d 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -42,6 +42,8 @@ option('guest_agent_msi', type : 'feature', value :
> 'auto',
> description: 'Build MSI package for the QEMU Guest Agent')
> option('tools', type : 'feature', value : 'auto',
> description: 'build support utilities that come with QEMU')
> +option('qga_vss', type : 'feature', value: 'auto',
> + description: 'build QGA VSS support (broken with MinGW)')
>
> option('malloc_trim', type : 'feature', value : 'auto',
> description: 'enable libc malloc_trim() for memory optimization')
> diff --git a/qga/meson.build b/qga/meson.build
> index 97cc391fe1..ca795f44fb 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -2,9 +2,26 @@ if not have_ga
> if get_option('guest_agent_msi').enabled()
> error('Guest agent MSI requested, but the guest agent is not being
> built')
> endif
> + have_qga_vss = false
> subdir_done()
> endif
>
> +have_qga_vss = get_option('qga_vss') \
> + .require(targetos == 'windows',
> + error_message: 'VSS support requires Windows') \
> + .require(link_language == 'cpp',
> + error_message: 'VSS support requires a C++ compiler') \
> + .require(have_vss, error_message: '''VSS support requires VSS headers.
> + If your Visual Studio installation doesn't have the VSS headers,
> + Please download and install Microsoft VSS SDK:
> + http://www.microsoft.com/en-us/download/details.aspx?id=23490
> + On POSIX-systems, MinGW doesn't yet provide working headers.
> + you can extract the SDK headers by:
> + $ scripts/extract-vsssdk-headers setup.exe
> + The headers are extracted in the directory \`inc'.
>
inc/2003
> + Then run configure with: --extra-cxxflags="-isystem
> /path/to/vss/inc"''') \
>
inc/2003
thanks
+ .allowed()
> +
> all_qga = []
>
> qga_qapi_outputs = [
> @@ -63,7 +80,7 @@ gen_tlb = []
> qga_libs = []
> if targetos == 'windows'
> qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32',
> '-lwininet', '-liphlpapi', '-lnetapi32']
> - if 'CONFIG_QGA_VSS' in config_host
> + if have_qga_vss
> qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++',
> '-Wl,--enable-stdcall-fixup']
> subdir('vss-win32')
> endif
> @@ -93,7 +110,7 @@ if targetos == 'windows'
> if wixl.found()
> deps = [gen_tlb, qga]
> qemu_ga_msi_vss = []
> - if 'CONFIG_QGA_VSS' in config_host
> + if have_qga_vss
> qemu_ga_msi_vss = ['-D', 'InstallVss']
> deps += qga_vss
> endif
> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> index 895d8310b4..23de2a6c62 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -20,6 +20,7 @@ meson_options_help() {
> printf "%s\n" ' --enable-malloc=CHOICE choose memory allocator to
> use [system] (choices:'
> printf "%s\n" ' jemalloc/system/tcmalloc)'
> printf "%s\n" ' --enable-profiler profiler support'
> + printf "%s\n" ' --enable-qga-vss build QGA VSS support'
> printf "%s\n" ' --enable-qom-cast-debug cast debugging support'
> printf "%s\n" ' --enable-rng-none dummy RNG, avoid using
> /dev/(u)random and'
> printf "%s\n" ' getrandom()'
> @@ -288,6 +289,8 @@ _meson_option_parse() {
> --disable-qcow1) printf "%s" -Dqcow1=disabled ;;
> --enable-qed) printf "%s" -Dqed=enabled ;;
> --disable-qed) printf "%s" -Dqed=disabled ;;
> + --enable-qga-vss) printf "%s" -Dqga_vss=enabled ;;
> + --disable-qga-vss) printf "%s" -Dqga_vss=disabled ;;
> --enable-qom-cast-debug) printf "%s" -Dqom_cast_debug=true ;;
> --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;;
> --enable-rbd) printf "%s" -Drbd=enabled ;;
> --
> 2.34.1
>
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 13244 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (21 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 22/27] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-08 11:14 ` Konstantin Kostiuk
2022-02-03 17:33 ` [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file Paolo Bonzini
` (3 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
C++ presence is checked by the qga/ directory, so it can be assumed
when building VSS module.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/vss-win32/meson.build | 41 +++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 8f3aff5fe3..8d4c5708d8 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -1,22 +1,29 @@
-if add_languages('cpp', required: false)
- glib_dynamic = dependency('glib-2.0', static: false)
- link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
- '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
+glib_dynamic = dependency('glib-2.0', static: false)
+link_args = cc.get_supported_link_arguments([
+ '-fstack-protector-all',
+ '-fstack-protector-strong',
+ '-Wl,--add-stdcall-alias',
+ '-Wl,--enable-stdcall-fixup'
+])
- qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
- name_prefix: '',
- cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
- link_args: link_args,
- vs_module_defs: 'qga-vss.def',
- dependencies: [glib_dynamic, socket,
- cc.find_library('ole32'),
- cc.find_library('oleaut32'),
- cc.find_library('shlwapi'),
- cc.find_library('uuid'),
- cc.find_library('intl')])
+qga_vss = shared_module(
+ 'qga-vss',
+ ['requester.cpp', 'provider.cpp', 'install.cpp'],
+ name_prefix: '',
+ cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
+ link_args: link_args,
+ vs_module_defs: 'qga-vss.def',
+ dependencies: [
+ glib_dynamic, socket,
+ cc.find_library('ole32'),
+ cc.find_library('oleaut32'),
+ cc.find_library('shlwapi'),
+ cc.find_library('uuid'),
+ cc.find_library('intl')
+ ]
+)
- all_qga += qga_vss
-endif
+all_qga += qga_vss
midl = find_program('midl', required: false)
widl = find_program('widl', required: false)
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence
2022-02-03 17:33 ` [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence Paolo Bonzini
@ 2022-02-08 11:14 ` Konstantin Kostiuk
2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:14 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2759 bytes --]
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Thu, Feb 3, 2022 at 8:14 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> C++ presence is checked by the qga/ directory, so it can be assumed
> when building VSS module.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> qga/vss-win32/meson.build | 41 +++++++++++++++++++++++----------------
> 1 file changed, 24 insertions(+), 17 deletions(-)
>
> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
> index 8f3aff5fe3..8d4c5708d8 100644
> --- a/qga/vss-win32/meson.build
> +++ b/qga/vss-win32/meson.build
> @@ -1,22 +1,29 @@
> -if add_languages('cpp', required: false)
> - glib_dynamic = dependency('glib-2.0', static: false)
> - link_args = cc.get_supported_link_arguments(['-fstack-protector-all',
> '-fstack-protector-strong',
> - '-Wl,--add-stdcall-alias',
> '-Wl,--enable-stdcall-fixup'])
> +glib_dynamic = dependency('glib-2.0', static: false)
> +link_args = cc.get_supported_link_arguments([
> + '-fstack-protector-all',
> + '-fstack-protector-strong',
> + '-Wl,--add-stdcall-alias',
> + '-Wl,--enable-stdcall-fixup'
> +])
>
> - qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp',
> 'install.cpp'],
> - name_prefix: '',
> - cpp_args: ['-Wno-unknown-pragmas',
> '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
> - link_args: link_args,
> - vs_module_defs: 'qga-vss.def',
> - dependencies: [glib_dynamic, socket,
> - cc.find_library('ole32'),
> - cc.find_library('oleaut32'),
> - cc.find_library('shlwapi'),
> - cc.find_library('uuid'),
> - cc.find_library('intl')])
> +qga_vss = shared_module(
> + 'qga-vss',
> + ['requester.cpp', 'provider.cpp', 'install.cpp'],
> + name_prefix: '',
> + cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor',
> '-Wno-non-virtual-dtor'],
> + link_args: link_args,
> + vs_module_defs: 'qga-vss.def',
> + dependencies: [
> + glib_dynamic, socket,
> + cc.find_library('ole32'),
> + cc.find_library('oleaut32'),
> + cc.find_library('shlwapi'),
> + cc.find_library('uuid'),
> + cc.find_library('intl')
> + ]
> +)
>
> - all_qga += qga_vss
> -endif
> +all_qga += qga_vss
>
> midl = find_program('midl', required: false)
> widl = find_program('widl', required: false)
> --
> 2.34.1
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 3916 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence
2022-02-08 11:14 ` Konstantin Kostiuk
@ 2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:20 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2933 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Tue, Feb 8, 2022 at 1:14 PM Konstantin Kostiuk <kkostiuk@redhat.com>
wrote:
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
>
> On Thu, Feb 3, 2022 at 8:14 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> C++ presence is checked by the qga/ directory, so it can be assumed
>> when building VSS module.
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> qga/vss-win32/meson.build | 41 +++++++++++++++++++++++----------------
>> 1 file changed, 24 insertions(+), 17 deletions(-)
>>
>> diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
>> index 8f3aff5fe3..8d4c5708d8 100644
>> --- a/qga/vss-win32/meson.build
>> +++ b/qga/vss-win32/meson.build
>> @@ -1,22 +1,29 @@
>> -if add_languages('cpp', required: false)
>> - glib_dynamic = dependency('glib-2.0', static: false)
>> - link_args = cc.get_supported_link_arguments(['-fstack-protector-all',
>> '-fstack-protector-strong',
>> -
>> '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
>> +glib_dynamic = dependency('glib-2.0', static: false)
>> +link_args = cc.get_supported_link_arguments([
>> + '-fstack-protector-all',
>> + '-fstack-protector-strong',
>> + '-Wl,--add-stdcall-alias',
>> + '-Wl,--enable-stdcall-fixup'
>> +])
>>
>> - qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp',
>> 'install.cpp'],
>> - name_prefix: '',
>> - cpp_args: ['-Wno-unknown-pragmas',
>> '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
>> - link_args: link_args,
>> - vs_module_defs: 'qga-vss.def',
>> - dependencies: [glib_dynamic, socket,
>> - cc.find_library('ole32'),
>> - cc.find_library('oleaut32'),
>> - cc.find_library('shlwapi'),
>> - cc.find_library('uuid'),
>> - cc.find_library('intl')])
>> +qga_vss = shared_module(
>> + 'qga-vss',
>> + ['requester.cpp', 'provider.cpp', 'install.cpp'],
>> + name_prefix: '',
>> + cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor',
>> '-Wno-non-virtual-dtor'],
>> + link_args: link_args,
>> + vs_module_defs: 'qga-vss.def',
>> + dependencies: [
>> + glib_dynamic, socket,
>> + cc.find_library('ole32'),
>> + cc.find_library('oleaut32'),
>> + cc.find_library('shlwapi'),
>> + cc.find_library('uuid'),
>> + cc.find_library('intl')
>> + ]
>> +)
>>
>> - all_qga += qga_vss
>> -endif
>> +all_qga += qga_vss
>>
>> midl = find_program('midl', required: false)
>> widl = find_program('widl', required: false)
>> --
>> 2.34.1
>>
>>
>>
>>
[-- Attachment #2: Type: text/html, Size: 4425 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (22 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 23/27] meson: do not make qga/vss-win32/meson.build conditional on C++ presence Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-04 5:18 ` Philippe Mathieu-Daudé via
2022-02-03 17:33 ` [PATCH 25/27] meson: require dynamic linking for VSS support Paolo Bonzini
` (2 subsequent siblings)
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
There are no good reason anymore to keep a pre-built file in the repository.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 4 ++++
qga/meson.build | 2 ++
qga/vss-win32/meson.build | 9 +--------
qga/vss-win32/qga-vss.tlb | Bin 1528 -> 0 bytes
4 files changed, 7 insertions(+), 8 deletions(-)
delete mode 100644 qga/vss-win32/qga-vss.tlb
diff --git a/meson.build b/meson.build
index e3499a7e9a..999d2c8bd1 100644
--- a/meson.build
+++ b/meson.build
@@ -307,8 +307,12 @@ iokit = []
emulator_link_args = []
nvmm =not_found
hvf = not_found
+midl = not_found
+widl = not_found
host_dsosuf = '.so'
if targetos == 'windows'
+ midl = find_program('midl', required: false)
+ widl = find_program('widl', required: false)
socket = cc.find_library('ws2_32')
winmm = cc.find_library('winmm')
diff --git a/qga/meson.build b/qga/meson.build
index ca795f44fb..804cc842dc 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -20,6 +20,8 @@ have_qga_vss = get_option('qga_vss') \
$ scripts/extract-vsssdk-headers setup.exe
The headers are extracted in the directory \`inc'.
Then run configure with: --extra-cxxflags="-isystem /path/to/vss/inc"''') \
+ .require(midl.found() or widl.found(),
+ error_message: 'VSS support requires midl or widl') \
.allowed()
all_qga = []
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index 8d4c5708d8..c064a4e245 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -25,21 +25,14 @@ qga_vss = shared_module(
all_qga += qga_vss
-midl = find_program('midl', required: false)
-widl = find_program('widl', required: false)
if midl.found()
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.idl',
output: 'qga-vss.tlb',
command: [midl, '@INPUT@', '/tlb', '@OUTPUT@'])
-elif widl.found()
+else
gen_tlb = custom_target('gen-tlb',
input: 'qga-vss.idl',
output: 'qga-vss.tlb',
command: [widl, '-t', '@INPUT@', '-o', '@OUTPUT@'])
-else
- gen_tlb = custom_target('gen-tlb',
- input: 'qga-vss.tlb',
- output: 'qga-vss.tlb',
- command: ['cp', '@INPUT@', '@OUTPUT@'])
endif
diff --git a/qga/vss-win32/qga-vss.tlb b/qga/vss-win32/qga-vss.tlb
deleted file mode 100644
index 226452a1861371ffe0cad1019cf90fdfdcd5ef49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1528
zcmeYbb_-!*U}OLRP8Kl5;0UB3A_y8H!@$4<WGF*9|A9aP$W{R21|SCUVfs9Pj1;IC
zKahR`)X0Ox{{ZC6An~sN`2tA%H9-9hNPHcj{0byK4>OPh6a(1_GM|T)fx!kz-UG<D
zK;nbc0l9GX===tt`Vb`fD?q*q5+7YXI$u?Zf#C;G4-9~uhYKVCC4f!`hZ{(Z0*HVD
zkhwswGqAt}ki;hd*$F@lQbP%-z+r|5P#hGW*vvKniaRx03p~wP?y>h_rLW<nKOg@=
z6{hYgzgH7@QE<^MU>KC!yoBjb#vz`9Lwu4+R-SJ!kIOX4xLBUUGN9-NyTyP76j}@n
z2f!qQ8-xepfXD+7rW+{SKz4&@7#qX~^1#sn3O|tFK>%ciE<<riN`6kNkzPqoQh0bc
zNbM*XJ|Un0jALSb15^rEE6h+Y8tCpA798vm9#E8DmYI@T<dc~c4pSpwQKEn@FU<fE
zfvHyrsVqoU0O~4AEUE;iEfI8i=bXgi;_z?|20Ng!&PAz-C8;S2NtFt|o-RHLWvNBQ
znfZAN=6VJOdIqMZrV5EA3T{Q23NES13Py$shQ?OLW>&_Q3PuKoMqI)S5zj9Ngog_=
gXfrXehlhjmFbIJB4$8MKU>*YlD1Z9^F{m5{03Vre%>V!Z
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file
2022-02-03 17:33 ` [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file Paolo Bonzini
@ 2022-02-04 5:18 ` Philippe Mathieu-Daudé via
2022-02-08 11:21 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-02-04 5:18 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: marcandre.lureau
On 3/2/22 18:33, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> There are no good reason anymore to keep a pre-built file in the repository.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> meson.build | 4 ++++
> qga/meson.build | 2 ++
> qga/vss-win32/meson.build | 9 +--------
> qga/vss-win32/qga-vss.tlb | Bin 1528 -> 0 bytes
> 4 files changed, 7 insertions(+), 8 deletions(-)
> delete mode 100644 qga/vss-win32/qga-vss.tlb
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file
2022-02-04 5:18 ` Philippe Mathieu-Daudé via
@ 2022-02-08 11:21 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:21 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, qemu-devel, Marc-André Lureau
[-- Attachment #1: Type: text/plain, Size: 847 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Fri, Feb 4, 2022 at 7:20 AM Philippe Mathieu-Daudé via <
qemu-devel@nongnu.org> wrote:
> On 3/2/22 18:33, Paolo Bonzini wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > There are no good reason anymore to keep a pre-built file in the
> repository.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > meson.build | 4 ++++
> > qga/meson.build | 2 ++
> > qga/vss-win32/meson.build | 9 +--------
> > qga/vss-win32/qga-vss.tlb | Bin 1528 -> 0 bytes
> > 4 files changed, 7 insertions(+), 8 deletions(-)
> > delete mode 100644 qga/vss-win32/qga-vss.tlb
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
>
[-- Attachment #2: Type: text/html, Size: 1555 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 25/27] meson: require dynamic linking for VSS support
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (23 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 24/27] qga/vss-win32: require widl/midl, remove pre-built TLB file Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-04 5:19 ` Philippe Mathieu-Daudé via
2022-02-03 17:33 ` [PATCH 26/27] meson, configure: move ntddscsi API check to meson Paolo Bonzini
2022-02-03 17:33 ` [PATCH 27/27] configure, meson: move CONFIG_IASL to a Meson option Paolo Bonzini
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The glib_dynamic detection does not work because the dependency is
overridden in the main meson.build.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Rewritten commit message, added requirement in qga/meson.build - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/meson.build | 2 ++
qga/vss-win32/meson.build | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qga/meson.build b/qga/meson.build
index 804cc842dc..8c177435ac 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -22,6 +22,8 @@ have_qga_vss = get_option('qga_vss') \
Then run configure with: --extra-cxxflags="-isystem /path/to/vss/inc"''') \
.require(midl.found() or widl.found(),
error_message: 'VSS support requires midl or widl') \
+ .require(not enable_static,
+ error_message: 'VSS support requires dynamic linking with GLib') \
.allowed()
all_qga = []
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
index c064a4e245..71c50d0866 100644
--- a/qga/vss-win32/meson.build
+++ b/qga/vss-win32/meson.build
@@ -1,4 +1,3 @@
-glib_dynamic = dependency('glib-2.0', static: false)
link_args = cc.get_supported_link_arguments([
'-fstack-protector-all',
'-fstack-protector-strong',
@@ -14,7 +13,8 @@ qga_vss = shared_module(
link_args: link_args,
vs_module_defs: 'qga-vss.def',
dependencies: [
- glib_dynamic, socket,
+ glib,
+ socket,
cc.find_library('ole32'),
cc.find_library('oleaut32'),
cc.find_library('shlwapi'),
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 25/27] meson: require dynamic linking for VSS support
2022-02-03 17:33 ` [PATCH 25/27] meson: require dynamic linking for VSS support Paolo Bonzini
@ 2022-02-04 5:19 ` Philippe Mathieu-Daudé via
2022-02-08 11:23 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-02-04 5:19 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: marcandre.lureau
On 3/2/22 18:33, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The glib_dynamic detection does not work because the dependency is
> overridden in the main meson.build.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> [Rewritten commit message, added requirement in qga/meson.build - Paolo]
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> qga/meson.build | 2 ++
> qga/vss-win32/meson.build | 4 ++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 46+ messages in thread
* Re: [PATCH 25/27] meson: require dynamic linking for VSS support
2022-02-04 5:19 ` Philippe Mathieu-Daudé via
@ 2022-02-08 11:23 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:23 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, qemu-devel, Marc-André Lureau
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Fri, Feb 4, 2022 at 7:23 AM Philippe Mathieu-Daudé via <
qemu-devel@nongnu.org> wrote:
> On 3/2/22 18:33, Paolo Bonzini wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > The glib_dynamic detection does not work because the dependency is
> > overridden in the main meson.build.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > [Rewritten commit message, added requirement in qga/meson.build - Paolo]
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > qga/meson.build | 2 ++
> > qga/vss-win32/meson.build | 4 ++--
> > 2 files changed, 4 insertions(+), 2 deletions(-)
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
>
[-- Attachment #2: Type: text/html, Size: 1476 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 26/27] meson, configure: move ntddscsi API check to meson
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (24 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 25/27] meson: require dynamic linking for VSS support Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
2022-02-08 11:15 ` Konstantin Kostiuk
2022-02-03 17:33 ` [PATCH 27/27] configure, meson: move CONFIG_IASL to a Meson option Paolo Bonzini
26 siblings, 1 reply; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 23 -----------------------
meson.build | 18 +++++++++++++++++-
qga/commands-win32.c | 6 +++---
qga/meson.build | 2 +-
4 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/configure b/configure
index f67088044f..f6b9e5a1cd 100755
--- a/configure
+++ b/configure
@@ -2289,26 +2289,6 @@ EOF
fi
fi
-##########################################
-# check if mingw environment provides a recent ntddscsi.h
-guest_agent_ntddscsi="no"
-if test "$mingw32" = "yes"; then
- cat > $TMPC << EOF
-#include <windows.h>
-#include <ntddscsi.h>
-int main(void) {
-#if !defined(IOCTL_SCSI_GET_ADDRESS)
-#error Missing required ioctl definitions
-#endif
- SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
- return addr.Lun;
-}
-EOF
- if compile_prog "" "" ; then
- guest_agent_ntddscsi=yes
- fi
-fi
-
##########################################
# capstone
@@ -2818,9 +2798,6 @@ if test "$debug_tcg" = "yes" ; then
fi
if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak
- if test "$guest_agent_ntddscsi" = "yes" ; then
- echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
- fi
echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 999d2c8bd1..98e795d21a 100644
--- a/meson.build
+++ b/meson.build
@@ -1944,6 +1944,22 @@ if targetos == 'windows' and link_language == 'cpp'
int main(void) { return VSS_CTX_BACKUP; }''')
endif
+have_ntddscsi = false
+if targetos == 'windows'
+ have_ntddscsi = cc.compiles('''
+ #include <windows.h>
+ #include <ntddscsi.h>
+ int main(void) {
+ #if !defined(IOCTL_SCSI_GET_ADDRESS)
+ #error Missing required ioctl definitions
+ #endif
+ SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
+ return addr.Lun;
+ }
+''')
+endif
+config_host_data.set('HAVE_NTDDSCSI', have_ntddscsi)
+
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
'HAVE_GDB_BIN']
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
@@ -3615,7 +3631,7 @@ summary_info += {'libnfs support': libnfs}
if targetos == 'windows'
if have_ga
summary_info += {'QGA VSS support': have_qga_vss}
- summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
+ summary_info += {'QGA w32 disk info': have_ntddscsi}
endif
endif
summary_info += {'seccomp support': seccomp}
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 484cb1c6bd..4fbbad793f 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -18,7 +18,7 @@
#include <ws2tcpip.h>
#include <iptypes.h>
#include <iphlpapi.h>
-#ifdef CONFIG_QGA_NTDDSCSI
+#ifdef HAVE_NTDDSCSI
#include <winioctl.h>
#include <ntddscsi.h>
#endif
@@ -474,7 +474,7 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)
}
}
-#ifdef CONFIG_QGA_NTDDSCSI
+#ifdef HAVE_NTDDSCSI
static GuestDiskBusType win2qemu[] = {
[BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN,
@@ -1111,7 +1111,7 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
return NULL;
}
-#endif /* CONFIG_QGA_NTDDSCSI */
+#endif /* HAVE_NTDDSCSI */
static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
{
diff --git a/qga/meson.build b/qga/meson.build
index 8c177435ac..fe0bfc295f 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -88,7 +88,7 @@ if targetos == 'windows'
qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup']
subdir('vss-win32')
endif
- if 'CONFIG_QGA_NTDDSCSI' in config_host
+ if have_ntddscsi
qga_libs += ['-lsetupapi', '-lcfgmgr32']
endif
endif
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread* Re: [PATCH 26/27] meson, configure: move ntddscsi API check to meson
2022-02-03 17:33 ` [PATCH 26/27] meson, configure: move ntddscsi API check to meson Paolo Bonzini
@ 2022-02-08 11:15 ` Konstantin Kostiuk
2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 1 reply; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:15 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 4560 bytes --]
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Thu, Feb 3, 2022 at 8:03 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 23 -----------------------
> meson.build | 18 +++++++++++++++++-
> qga/commands-win32.c | 6 +++---
> qga/meson.build | 2 +-
> 4 files changed, 21 insertions(+), 28 deletions(-)
>
> diff --git a/configure b/configure
> index f67088044f..f6b9e5a1cd 100755
> --- a/configure
> +++ b/configure
> @@ -2289,26 +2289,6 @@ EOF
> fi
> fi
>
> -##########################################
> -# check if mingw environment provides a recent ntddscsi.h
> -guest_agent_ntddscsi="no"
> -if test "$mingw32" = "yes"; then
> - cat > $TMPC << EOF
> -#include <windows.h>
> -#include <ntddscsi.h>
> -int main(void) {
> -#if !defined(IOCTL_SCSI_GET_ADDRESS)
> -#error Missing required ioctl definitions
> -#endif
> - SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
> - return addr.Lun;
> -}
> -EOF
> - if compile_prog "" "" ; then
> - guest_agent_ntddscsi=yes
> - fi
> -fi
> -
> ##########################################
> # capstone
>
> @@ -2818,9 +2798,6 @@ if test "$debug_tcg" = "yes" ; then
> fi
> if test "$mingw32" = "yes" ; then
> echo "CONFIG_WIN32=y" >> $config_host_mak
> - if test "$guest_agent_ntddscsi" = "yes" ; then
> - echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
> - fi
> echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >>
> $config_host_mak
> echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
> echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
> diff --git a/meson.build b/meson.build
> index 999d2c8bd1..98e795d21a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1944,6 +1944,22 @@ if targetos == 'windows' and link_language == 'cpp'
> int main(void) { return VSS_CTX_BACKUP; }''')
> endif
>
> +have_ntddscsi = false
> +if targetos == 'windows'
> + have_ntddscsi = cc.compiles('''
> + #include <windows.h>
> + #include <ntddscsi.h>
> + int main(void) {
> + #if !defined(IOCTL_SCSI_GET_ADDRESS)
> + #error Missing required ioctl definitions
> + #endif
> + SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
> + return addr.Lun;
> + }
> +''')
> +endif
> +config_host_data.set('HAVE_NTDDSCSI', have_ntddscsi)
> +
> ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
> 'HAVE_GDB_BIN']
> arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
> @@ -3615,7 +3631,7 @@ summary_info += {'libnfs support': libnfs}
> if targetos == 'windows'
> if have_ga
> summary_info += {'QGA VSS support': have_qga_vss}
> - summary_info += {'QGA w32 disk info':
> config_host.has_key('CONFIG_QGA_NTDDSCSI')}
> + summary_info += {'QGA w32 disk info': have_ntddscsi}
> endif
> endif
> summary_info += {'seccomp support': seccomp}
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 484cb1c6bd..4fbbad793f 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -18,7 +18,7 @@
> #include <ws2tcpip.h>
> #include <iptypes.h>
> #include <iphlpapi.h>
> -#ifdef CONFIG_QGA_NTDDSCSI
> +#ifdef HAVE_NTDDSCSI
> #include <winioctl.h>
> #include <ntddscsi.h>
> #endif
> @@ -474,7 +474,7 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)
> }
> }
>
> -#ifdef CONFIG_QGA_NTDDSCSI
> +#ifdef HAVE_NTDDSCSI
>
> static GuestDiskBusType win2qemu[] = {
> [BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN,
> @@ -1111,7 +1111,7 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
> return NULL;
> }
>
> -#endif /* CONFIG_QGA_NTDDSCSI */
> +#endif /* HAVE_NTDDSCSI */
>
> static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
> {
> diff --git a/qga/meson.build b/qga/meson.build
> index 8c177435ac..fe0bfc295f 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -88,7 +88,7 @@ if targetos == 'windows'
> qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++',
> '-Wl,--enable-stdcall-fixup']
> subdir('vss-win32')
> endif
> - if 'CONFIG_QGA_NTDDSCSI' in config_host
> + if have_ntddscsi
> qga_libs += ['-lsetupapi', '-lcfgmgr32']
> endif
> endif
> --
> 2.34.1
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 5984 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread* Re: [PATCH 26/27] meson, configure: move ntddscsi API check to meson
2022-02-08 11:15 ` Konstantin Kostiuk
@ 2022-02-08 11:20 ` Konstantin Kostiuk
0 siblings, 0 replies; 46+ messages in thread
From: Konstantin Kostiuk @ 2022-02-08 11:20 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 4851 bytes --]
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
On Tue, Feb 8, 2022 at 1:15 PM Konstantin Kostiuk <kkostiuk@redhat.com>
wrote:
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
>
> On Thu, Feb 3, 2022 at 8:03 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> configure | 23 -----------------------
>> meson.build | 18 +++++++++++++++++-
>> qga/commands-win32.c | 6 +++---
>> qga/meson.build | 2 +-
>> 4 files changed, 21 insertions(+), 28 deletions(-)
>>
>> diff --git a/configure b/configure
>> index f67088044f..f6b9e5a1cd 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2289,26 +2289,6 @@ EOF
>> fi
>> fi
>>
>> -##########################################
>> -# check if mingw environment provides a recent ntddscsi.h
>> -guest_agent_ntddscsi="no"
>> -if test "$mingw32" = "yes"; then
>> - cat > $TMPC << EOF
>> -#include <windows.h>
>> -#include <ntddscsi.h>
>> -int main(void) {
>> -#if !defined(IOCTL_SCSI_GET_ADDRESS)
>> -#error Missing required ioctl definitions
>> -#endif
>> - SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
>> - return addr.Lun;
>> -}
>> -EOF
>> - if compile_prog "" "" ; then
>> - guest_agent_ntddscsi=yes
>> - fi
>> -fi
>> -
>> ##########################################
>> # capstone
>>
>> @@ -2818,9 +2798,6 @@ if test "$debug_tcg" = "yes" ; then
>> fi
>> if test "$mingw32" = "yes" ; then
>> echo "CONFIG_WIN32=y" >> $config_host_mak
>> - if test "$guest_agent_ntddscsi" = "yes" ; then
>> - echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
>> - fi
>> echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >>
>> $config_host_mak
>> echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
>> echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
>> diff --git a/meson.build b/meson.build
>> index 999d2c8bd1..98e795d21a 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -1944,6 +1944,22 @@ if targetos == 'windows' and link_language == 'cpp'
>> int main(void) { return VSS_CTX_BACKUP; }''')
>> endif
>>
>> +have_ntddscsi = false
>> +if targetos == 'windows'
>> + have_ntddscsi = cc.compiles('''
>> + #include <windows.h>
>> + #include <ntddscsi.h>
>> + int main(void) {
>> + #if !defined(IOCTL_SCSI_GET_ADDRESS)
>> + #error Missing required ioctl definitions
>> + #endif
>> + SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
>> + return addr.Lun;
>> + }
>> +''')
>> +endif
>> +config_host_data.set('HAVE_NTDDSCSI', have_ntddscsi)
>> +
>> ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
>> 'HAVE_GDB_BIN']
>> arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
>> @@ -3615,7 +3631,7 @@ summary_info += {'libnfs support': libnfs}
>> if targetos == 'windows'
>> if have_ga
>> summary_info += {'QGA VSS support': have_qga_vss}
>> - summary_info += {'QGA w32 disk info':
>> config_host.has_key('CONFIG_QGA_NTDDSCSI')}
>> + summary_info += {'QGA w32 disk info': have_ntddscsi}
>> endif
>> endif
>> summary_info += {'seccomp support': seccomp}
>> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
>> index 484cb1c6bd..4fbbad793f 100644
>> --- a/qga/commands-win32.c
>> +++ b/qga/commands-win32.c
>> @@ -18,7 +18,7 @@
>> #include <ws2tcpip.h>
>> #include <iptypes.h>
>> #include <iphlpapi.h>
>> -#ifdef CONFIG_QGA_NTDDSCSI
>> +#ifdef HAVE_NTDDSCSI
>> #include <winioctl.h>
>> #include <ntddscsi.h>
>> #endif
>> @@ -474,7 +474,7 @@ void qmp_guest_file_flush(int64_t handle, Error
>> **errp)
>> }
>> }
>>
>> -#ifdef CONFIG_QGA_NTDDSCSI
>> +#ifdef HAVE_NTDDSCSI
>>
>> static GuestDiskBusType win2qemu[] = {
>> [BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN,
>> @@ -1111,7 +1111,7 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
>> return NULL;
>> }
>>
>> -#endif /* CONFIG_QGA_NTDDSCSI */
>> +#endif /* HAVE_NTDDSCSI */
>>
>> static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
>> {
>> diff --git a/qga/meson.build b/qga/meson.build
>> index 8c177435ac..fe0bfc295f 100644
>> --- a/qga/meson.build
>> +++ b/qga/meson.build
>> @@ -88,7 +88,7 @@ if targetos == 'windows'
>> qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++',
>> '-Wl,--enable-stdcall-fixup']
>> subdir('vss-win32')
>> endif
>> - if 'CONFIG_QGA_NTDDSCSI' in config_host
>> + if have_ntddscsi
>> qga_libs += ['-lsetupapi', '-lcfgmgr32']
>> endif
>> endif
>> --
>> 2.34.1
>>
>>
>>
>>
[-- Attachment #2: Type: text/html, Size: 6493 bytes --]
^ permalink raw reply [flat|nested] 46+ messages in thread
* [PATCH 27/27] configure, meson: move CONFIG_IASL to a Meson option
2022-02-03 17:33 [PATCH 00/27] Next batch of Meson cleanups and conversions Paolo Bonzini
` (25 preceding siblings ...)
2022-02-03 17:33 ` [PATCH 26/27] meson, configure: move ntddscsi API check to meson Paolo Bonzini
@ 2022-02-03 17:33 ` Paolo Bonzini
26 siblings, 0 replies; 46+ messages in thread
From: Paolo Bonzini @ 2022-02-03 17:33 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 +---
meson.build | 12 ++++++++----
meson_options.txt | 2 ++
scripts/meson-buildoptions.py | 1 +
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index f6b9e5a1cd..b88942bd02 100755
--- a/configure
+++ b/configure
@@ -2950,9 +2950,6 @@ echo "MESON=$meson" >> $config_host_mak
echo "NINJA=$ninja" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
echo "HOST_CC=$host_cc" >> $config_host_mak
-if $iasl -h > /dev/null 2>&1; then
- echo "CONFIG_IASL=$iasl" >> $config_host_mak
-fi
echo "AR=$ar" >> $config_host_mak
echo "AS=$as" >> $config_host_mak
echo "CCAS=$ccas" >> $config_host_mak
@@ -3170,6 +3167,7 @@ if test "$skip_meson" = no; then
-Daudio_drv_list=$audio_drv_list \
-Ddefault_devices=$default_devices \
-Ddocdir="$docdir" \
+ -Diasl="$($iasl -h >/dev/null 2>&1 && printf %s "$iasl")" \
-Dqemu_firmwarepath="$firmwarepath" \
-Dqemu_suffix="$qemu_suffix" \
-Dsmbd="$smbd" \
diff --git a/meson.build b/meson.build
index 98e795d21a..3ddbe6093f 100644
--- a/meson.build
+++ b/meson.build
@@ -1468,7 +1468,9 @@ foreach k : get_option('trace_backends')
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
endforeach
config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file'))
-
+if get_option('iasl') != ''
+ config_host_data.set_quoted('CONFIG_IASL', get_option('iasl'))
+endif
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir)
@@ -1963,7 +1965,6 @@ config_host_data.set('HAVE_NTDDSCSI', have_ntddscsi)
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
'HAVE_GDB_BIN']
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
-strings = ['CONFIG_IASL']
foreach k, v: config_host
if ignored.contains(k)
# do nothing
@@ -1972,8 +1973,6 @@ foreach k, v: config_host
v = '"' + '", "'.join(v.split()) + '", '
endif
config_host_data.set(k, v)
- elif strings.contains(k)
- config_host_data.set_quoted(k, v)
elif k.startswith('CONFIG_')
config_host_data.set(k, v == 'y' ? 1 : v)
endif
@@ -3385,6 +3384,11 @@ summary_info += {'sphinx-build': sphinx_build}
if config_host.has_key('HAVE_GDB_BIN')
summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
endif
+if get_option('iasl') != ''
+ summary_info += {'iasl': get_option('iasl')}
+else
+ summary_info += {'iasl': false}
+endif
summary_info += {'genisoimage': config_host['GENISOIMAGE']}
if targetos == 'windows' and have_ga
summary_info += {'wixl': wixl}
diff --git a/meson_options.txt b/meson_options.txt
index aad337592d..30237917df 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,6 +12,8 @@ option('smbd', type : 'string', value : '',
description: 'Path to smbd for slirp networking')
option('sphinx_build', type : 'string', value : '',
description: 'Use specified sphinx-build [$sphinx_build] for building document (default to be empty)')
+option('iasl', type : 'string', value : '',
+ description: 'Path to ACPI disassembler')
option('default_devices', type : 'boolean', value : true,
description: 'Include a default selection of devices in emulators')
option('audio_drv_list', type: 'array', value: ['default'],
diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py
index 01b10f7ae0..693be7b966 100755
--- a/scripts/meson-buildoptions.py
+++ b/scripts/meson-buildoptions.py
@@ -30,6 +30,7 @@
"default_devices",
"docdir",
"fuzzing_engine",
+ "iasl",
"qemu_firmwarepath",
"qemu_suffix",
"smbd",
--
2.34.1
^ permalink raw reply related [flat|nested] 46+ messages in thread