Commit a806e2a3 authored Nov 13, 2019 by Vitaly Kuznetsov Committed by Greg Kroah-Hartman Dec 13, 2019

selftests: kvm: fix build with glibc >= 2.30



[ Upstream commit e37f9f139f62deddff90c7298ae3a85026a71067 ]

Glibc-2.30 gained gettid() wrapper, selftests fail to compile:

lib/assert.c:58:14: error: static declaration of ‘gettid’ follows non-static declaration
   58 | static pid_t gettid(void)
      |              ^~~~~~
In file included from /usr/include/unistd.h:1170,
                 from include/test_util.h:18,
                 from lib/assert.c:10:
/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
   34 | extern __pid_t gettid (void) __THROW;
      |                ^~~~~~

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 15479dd1

tools/testing/selftests/kvm/lib/assert.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ static void test_dump_stack(void)
		#pragma GCC diagnostic pop
		}

		static pid_t gettid(void)
		static pid_t _gettid(void)
		{
		return syscall(SYS_gettid);
		}
		@@ -73,7 +73,7 @@ test_assert(bool exp, const char *exp_str,
		fprintf(stderr, "==== Test Assertion Failure ====\n"
		" %s:%u: %s\n"
		" pid=%d tid=%d - %s\n",
		file, line, exp_str, getpid(), gettid(),
		file, line, exp_str, getpid(), _gettid(),
		strerror(errno));
		test_dump_stack();
		if (fmt) {