diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-02 20:29:50 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-02 20:29:50 +0000 |
commit | 8545ae485b1e8e43cc0137310c4c68dbece59990 (patch) | |
tree | e5c7a35c156719ca8a7e342e2f94746c00c3f171 /meson.build | |
parent | 8680d6e36468f1ca00e2fe749bef50585d632401 (diff) | |
parent | af1bb3fe7f146fafdaadb479975ca2b53b49df40 (diff) | |
download | qemu-8545ae485b1e8e43cc0137310c4c68dbece59990.zip qemu-8545ae485b1e8e43cc0137310c4c68dbece59990.tar.gz qemu-8545ae485b1e8e43cc0137310c4c68dbece59990.tar.bz2 |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20201102a' into staging
Migration and virtiofs fixes 2020-11-02
Fixes for postcopy migration test hang
A seccomp crash for virtiofsd on some !x86
Help message and minor CID fix
And another crack at Max's set.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Mon 02 Nov 2020 19:54:59 GMT
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20201102a:
tests/acceptance: Add virtiofs_submounts.py
tests/acceptance/boot_linux: Accept SSH pubkey
virtiofsd: Announce sub-mount points
virtiofsd: Add mount ID to the lo_inode key
meson.build: Check for statx()
virtiofsd: Add attr_flags to fuse_entry_param
virtiofsd: Check FUSE_SUBMOUNTS
virtiofsd: Fix the help message of posix lock
tools/virtiofsd: Check vu_init() return value (CID 1435958)
virtiofsd: Seccomp: Add 'send' for syslog
migration: Postpone the kick of the fault thread after recover
migration: Unify reset of last_rb on destination node when recover
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 47e32e1..39ac5cf 100644 --- a/meson.build +++ b/meson.build @@ -736,6 +736,21 @@ if not has_malloc_trim and get_option('malloc_trim').enabled() endif endif +# Check whether the glibc provides statx() + +statx_test = ''' + #ifndef _GNU_SOURCE + #define _GNU_SOURCE + #endif + #include <sys/stat.h> + int main(void) { + struct statx statxbuf; + statx(0, "", 0, STATX_BASIC_STATS, &statxbuf); + return 0; + }''' + +has_statx = cc.links(statx_test) + ################# # config-host.h # ################# @@ -768,6 +783,7 @@ config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found()) config_host_data.set('CONFIG_KEYUTILS', keyutils.found()) config_host_data.set('CONFIG_GETTID', has_gettid) config_host_data.set('CONFIG_MALLOC_TRIM', has_malloc_trim) +config_host_data.set('CONFIG_STATX', has_statx) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version())) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1]) |