[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30
From: |
Paolo Bonzini |
Subject: |
[PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30 |
Date: |
Fri, 4 Sep 2020 07:41:01 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
gettid() was introduced with glibc 2.30.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-16-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 3 +++
tests/migration/stress.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/meson.build b/meson.build
index 7c714bb49c..b71f561c96 100644
--- a/meson.build
+++ b/meson.build
@@ -413,6 +413,8 @@ endif
keyutils = dependency('libkeyutils', required: false,
method: 'pkg-config', static: enable_static)
+has_gettid = cc.has_function('gettid')
+
# Create config-host.h
config_host_data.set('CONFIG_SDL', sdl.found())
@@ -423,6 +425,7 @@ config_host_data.set('CONFIG_VNC_PNG', png.found())
config_host_data.set('CONFIG_VNC_SASL', sasl.found())
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('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])
diff --git a/tests/migration/stress.c b/tests/migration/stress.c
index 05d85051e3..0c72a420be 100644
--- a/tests/migration/stress.c
+++ b/tests/migration/stress.c
@@ -29,10 +29,12 @@ const char *argv0;
#define PAGE_SIZE 4096
+#ifndef CONFIG_GETTID
static int gettid(void)
{
return syscall(SYS_gettid);
}
+#endif
static __attribute__((noreturn)) void exit_failure(void)
{
--
2.26.2
- [PULL 15/46] meson: declare keyutils dependency, (continued)
- [PULL 15/46] meson: declare keyutils dependency, Paolo Bonzini, 2020/09/04
- [PULL 05/46] mtest2make: split working directory from test command, Paolo Bonzini, 2020/09/04
- [PULL 03/46] tests: handling signal on win32 properly, Paolo Bonzini, 2020/09/04
- [PULL 11/46] ninjatool: use constant names for stamp files, Paolo Bonzini, 2020/09/04
- [PULL 18/46] meson: move keyutils dependency check, Paolo Bonzini, 2020/09/04
- [PULL 19/46] meson: remove old socket_scm_helper rule, Paolo Bonzini, 2020/09/04
- [PULL 21/46] meson: convert atomic*-bench, Paolo Bonzini, 2020/09/04
- [PULL 22/46] tests: do not print benchmark output to stdout, Paolo Bonzini, 2020/09/04
- [PULL 24/46] tests/migration/stress: remove unused exit_success, Paolo Bonzini, 2020/09/04
- [PULL 23/46] meson: convert the speed tests, Paolo Bonzini, 2020/09/04
- [PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30,
Paolo Bonzini <=
- [PULL 26/46] meson: convert migration/initrd-stress, Paolo Bonzini, 2020/09/04
- [PULL 27/46] configure: remove dead code for in-tree builds, Paolo Bonzini, 2020/09/04
- [PULL 28/46] meson: compute config_all_devices directly, Paolo Bonzini, 2020/09/04
- [PULL 29/46] Makefile: remove dead variables and includes, Paolo Bonzini, 2020/09/04
- [PULL 31/46] configure: move disassembler configuration to meson, Paolo Bonzini, 2020/09/04
- [PULL 32/46] configure: move C++ compiler handling to meson, Paolo Bonzini, 2020/09/04
- [PULL 33/46] meson: keep all compiler flags detection together, Paolo Bonzini, 2020/09/04
- [PULL 35/46] configure: remove unnecessary libm test, Paolo Bonzini, 2020/09/04
- [PULL 40/46] docs: suggest Meson replacements for various configure functions, Paolo Bonzini, 2020/09/04
- [PULL 41/46] configure: update dtc submodule, Paolo Bonzini, 2020/09/04