* [PULL v3 00/29] Misc mostly build system patches for 2022-02-15
@ 2022-02-21 10:34 Paolo Bonzini
2022-02-21 10:34 ` [PULL 08/29] configure, meson: move AF_ALG test to meson Paolo Bonzini
2022-02-22 13:07 ` [PULL v3 00/29] Misc mostly build system patches for 2022-02-15 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2022-02-21 10:34 UTC (permalink / raw)
To: qemu-devel
The following changes since commit ad38520bdeb2b1e0b487db317f29119e94c1c88d:
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2022-02-15 19:30:33 +0000)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 5dc4618e781f36c4bea1b0cdd1bea75b48640c5a:
configure, meson: move CONFIG_IASL to a Meson option (2022-02-21 10:35:54 +0100)
----------------------------------------------------------------
* More Meson conversions (0.59.x now required rather than suggested)
* UMIP support for TCG x86
* Fix migration crash
* Restore error output for check-block
----------------------------------------------------------------
v2->v3: AF_ALG must be disabled by default
Gareth Webb (1):
target/i386: add TCG support for UMIP
Marc-André Lureau (9):
qga/vss-win32: fix midl arguments
meson: drop --with-win-sdk
qga/vss-win32: use widl if available
qga/vss: use standard windows headers location
configure, meson: replace VSS SDK checks and options with --enable-vss-sdk
meson: do not make qga/vss-win32/meson.build conditional on C++ presence
qga/vss-win32: require widl/midl, remove pre-built TLB file
meson: require dynamic linking for VSS support
meson, configure: move ntddscsi API check to meson
Paolo Bonzini (17):
meson: use .allowed() method for features
meson: use .require() and .disable_auto_if() method for features
configure, meson: move AVX tests to meson
configure, meson: move membarrier test to meson
configure, meson: move AF_ALG test to meson
configure, meson: move libnuma detection to meson
configure, meson: move TPM check to meson
configure, meson: cleanup qemu-ga libraries
configure, meson: move image format options to meson_options.txt
configure, meson: move block layer options to meson_options.txt
meson: define qemu_cflags/qemu_ldflags
configure, meson: move some default-disabled options to meson_options.txt
configure, meson: move coroutine options to meson_options.txt
configure, meson: move smbd options to meson_options.txt
configure, meson: move guest-agent, tools to meson
meson: refine check for whether to look for virglrenderer
configure, meson: move CONFIG_IASL to a Meson option
Peter Xu (1):
memory: Fix qemu crash on starting dirty log twice with stopped VM
Thomas Huth (1):
tests/qemu-iotests/testrunner: Print diff to stderr in TAP mode
backends/tpm/meson.build | 14 +-
block/meson.build | 51 +++-
configure | 598 +------------------------------------
contrib/vhost-user-gpu/meson.build | 3 +-
crypto/meson.build | 6 +-
docs/devel/kconfig.rst | 2 +-
docs/meson.build | 2 -
hw/acpi/meson.build | 4 +-
meson.build | 429 +++++++++++++++++---------
meson_options.txt | 64 ++++
migration/meson.build | 4 +-
net/slirp.c | 16 +-
qga/commands-win32.c | 6 +-
qga/meson.build | 55 +++-
qga/vss-win32/install.cpp | 2 +-
qga/vss-win32/meson.build | 52 ++--
qga/vss-win32/provider.cpp | 4 +-
qga/vss-win32/qga-vss.tlb | Bin 1528 -> 0 bytes
qga/vss-win32/requester.cpp | 4 +-
qga/vss-win32/vss-common.h | 6 +-
scripts/meson-buildoptions.py | 2 +
scripts/meson-buildoptions.sh | 89 ++++++
softmmu/memory.c | 65 ++--
softmmu/meson.build | 5 +-
target/i386/cpu.c | 2 +-
target/i386/cpu.h | 4 +-
target/i386/helper.c | 8 +-
target/i386/tcg/translate.c | 15 +
tests/Makefile.include | 2 +-
tests/check-block.sh | 4 -
tests/meson.build | 2 +-
tests/qemu-iotests/meson.build | 2 +-
tests/qemu-iotests/testrunner.py | 5 +-
tests/unit/meson.build | 6 +-
tools/meson.build | 31 +-
util/meson.build | 4 +-
36 files changed, 690 insertions(+), 878 deletions(-)
delete mode 100644 qga/vss-win32/qga-vss.tlb
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 08/29] configure, meson: move AF_ALG test to meson
2022-02-21 10:34 [PULL v3 00/29] Misc mostly build system patches for 2022-02-15 Paolo Bonzini
@ 2022-02-21 10:34 ` Paolo Bonzini
2022-02-22 13:07 ` [PULL v3 00/29] Misc mostly build system patches for 2022-02-15 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2022-02-21 10:34 UTC (permalink / raw)
To: qemu-devel
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 c49797012d..07ea08cd08 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"
@@ -1402,7 +1397,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
@@ -2817,32 +2811,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
@@ -3308,10 +3276,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 6dc38a7916..9e1acb98aa 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>
@@ -3453,7 +3467,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..67592d47b3 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 : 'disabled',
+ 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 c204ede02b..a20d40e685 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'
@@ -135,6 +136,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] 3+ messages in thread
* Re: [PULL v3 00/29] Misc mostly build system patches for 2022-02-15
2022-02-21 10:34 [PULL v3 00/29] Misc mostly build system patches for 2022-02-15 Paolo Bonzini
2022-02-21 10:34 ` [PULL 08/29] configure, meson: move AF_ALG test to meson Paolo Bonzini
@ 2022-02-22 13:07 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2022-02-22 13:07 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On Mon, 21 Feb 2022 at 10:39, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit ad38520bdeb2b1e0b487db317f29119e94c1c88d:
>
> Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2022-02-15 19:30:33 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 5dc4618e781f36c4bea1b0cdd1bea75b48640c5a:
>
> configure, meson: move CONFIG_IASL to a Meson option (2022-02-21 10:35:54 +0100)
>
> ----------------------------------------------------------------
> * More Meson conversions (0.59.x now required rather than suggested)
> * UMIP support for TCG x86
> * Fix migration crash
> * Restore error output for check-block
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-22 13:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-21 10:34 [PULL v3 00/29] Misc mostly build system patches for 2022-02-15 Paolo Bonzini
2022-02-21 10:34 ` [PULL 08/29] configure, meson: move AF_ALG test to meson Paolo Bonzini
2022-02-22 13:07 ` [PULL v3 00/29] Misc mostly build system patches for 2022-02-15 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.