diff options
| author | Paolo Bonzini | 2022-04-20 17:33:42 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-04-28 08:52:22 +0200 |
| commit | 2edd2c04c27b469ab2b46c6fe6e4bffe6b0c2895 (patch) | |
| tree | 8ede384bdaf5749378e1270129ebdc905f8fe83c /configure | |
| parent | meson, configure: move RDMA options to meson (diff) | |
| download | qemu-2edd2c04c27b469ab2b46c6fe6e4bffe6b0c2895.tar.gz qemu-2edd2c04c27b469ab2b46c6fe6e4bffe6b0c2895.tar.xz qemu-2edd2c04c27b469ab2b46c6fe6e4bffe6b0c2895.zip | |
meson, configure: move keyctl test to meson
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 44 |
1 files changed, 0 insertions, 44 deletions
@@ -322,7 +322,6 @@ trace_file="trace" coroutine="" tls_priority="NORMAL" plugins="$default_feature" -secret_keyring="$default_feature" meson="" meson_args="" ninja="" @@ -1009,10 +1008,6 @@ for opt do ;; --gdb=*) gdb_bin="$optarg" ;; - --enable-keyring) secret_keyring="yes" - ;; - --disable-keyring) secret_keyring="no" - ;; --enable-gio) gio=yes ;; --disable-gio) gio=no @@ -2441,41 +2436,6 @@ case "$slirp" in esac ########################################## -# check for usable __NR_keyctl syscall - -if test "$linux" = "yes" ; then - - have_keyring=no - cat > $TMPC << EOF -#include <errno.h> -#include <asm/unistd.h> -#include <linux/keyctl.h> -#include <unistd.h> -int main(void) { - return syscall(__NR_keyctl, KEYCTL_READ, 0, NULL, NULL, 0); -} -EOF - if compile_prog "" "" ; then - have_keyring=yes - fi -fi -if test "$secret_keyring" != "no" -then - if test "$have_keyring" = "yes" - then - secret_keyring=yes - else - if test "$secret_keyring" = "yes" - then - error_exit "syscall __NR_keyctl requested, \ -but not implemented on your system" - else - secret_keyring=no - fi - fi -fi - -########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -2760,10 +2720,6 @@ if test -n "$gdb_bin"; then fi fi -if test "$secret_keyring" = "yes" ; then - echo "CONFIG_SECRET_KEYRING=y" >> $config_host_mak -fi - echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak |