[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/19] configure / meson: Move check for sys/kcov.h to meson.build
From: |
Laurent Vivier |
Subject: |
[PULL 18/19] configure / meson: Move check for sys/kcov.h to meson.build |
Date: |
Mon, 14 Dec 2020 16:57:32 +0100 |
From: Thomas Huth <thuth@redhat.com>
This check can be done in a much shorter way in meson.build. And while
we're at it, rename the #define to HAVE_SYS_KCOV_H to match the other
HAVE_someheader_H symbols that we already have.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201118171052.308191-6-thuth@redhat.com>
[lv: s/signal/kcov/]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
configure | 9 ---------
linux-user/ioctls.h | 2 +-
linux-user/syscall.c | 2 +-
meson.build | 1 +
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 4f0f9c99d3d2..6c13964b247a 100755
--- a/configure
+++ b/configure
@@ -4402,12 +4402,6 @@ if compile_prog "" "" ; then
syncfs=yes
fi
-# check for kcov support (kernel must be 4.4+, compiled with certain options)
-kcov=no
-if check_include sys/kcov.h ; then
- kcov=yes
-fi
-
# check for btrfs filesystem support (kernel must be 3.9+)
btrfs=no
if check_include linux/btrfs.h ; then
@@ -6112,9 +6106,6 @@ fi
if test "$syncfs" = "yes" ; then
echo "CONFIG_SYNCFS=y" >> $config_host_mak
fi
-if test "$kcov" = "yes" ; then
- echo "CONFIG_KCOV=y" >> $config_host_mak
-fi
if test "$btrfs" = "yes" ; then
echo "CONFIG_BTRFS=y" >> $config_host_mak
fi
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index 585874f090ff..8efb4d38c014 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -715,7 +715,7 @@
IOCTL_IGNORE(TIOCSTOP)
#endif
-#ifdef CONFIG_KCOV
+#ifdef HAVE_SYS_KCOV_H
IOCTL(KCOV_ENABLE, 0, TYPE_NULL)
IOCTL(KCOV_DISABLE, 0, TYPE_NULL)
IOCTL(KCOV_INIT_TRACE, IOC_R, TYPE_ULONG)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 27adee908ebc..063130be048c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -73,7 +73,7 @@
#ifdef CONFIG_SENDFILE
#include <sys/sendfile.h>
#endif
-#ifdef CONFIG_KCOV
+#ifdef HAVE_SYS_KCOV_H
#include <sys/kcov.h>
#endif
diff --git a/meson.build b/meson.build
index a790cc527cf9..04cdea75dd50 100644
--- a/meson.build
+++ b/meson.build
@@ -839,6 +839,7 @@ config_host_data.set('QEMU_VERSION_MICRO',
meson.project_version().split('.')[2]
config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
+config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h'))
config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
--
2.29.2
- [PULL 16/19] configure / meson: Move check for drm.h to meson.build, (continued)
- [PULL 16/19] configure / meson: Move check for drm.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 03/19] MAINTAINERS: update my email address, Laurent Vivier, 2020/12/14
- [PULL 05/19] hw/pci-host/pam: Replace magic number by PAM_REGIONS_COUNT definition, Laurent Vivier, 2020/12/14
- [PULL 10/19] elf2dmp/qemu_elf: Plug memleak in QEMU_Elf_init, Laurent Vivier, 2020/12/14
- [PULL 08/19] ads7846: moves from the hw/display folder to the hw/input folder., Laurent Vivier, 2020/12/14
- [PULL 07/19] CODING_STYLE.rst: Be less strict about 80 character limit, Laurent Vivier, 2020/12/14
- [PULL 04/19] hw/xen: Don't use '#' flag of printf format, Laurent Vivier, 2020/12/14
- [PULL 14/19] configure: Remove the obsolete check for ifaddrs.h, Laurent Vivier, 2020/12/14
- [PULL 09/19] configure: Test if $make actually exists, Laurent Vivier, 2020/12/14
- [PULL 17/19] configure / meson: Move check for sys/signal.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 18/19] configure / meson: Move check for sys/kcov.h to meson.build,
Laurent Vivier <=
- [PULL 19/19] configure / meson: Move check for linux/btrfs.h to meson.build, Laurent Vivier, 2020/12/14
- [PULL 13/19] blockdev: Fix a memleak in drive_backup_prepare(), Laurent Vivier, 2020/12/14
- [PULL 11/19] elf2dmp/pdb: Plug memleak in pdb_init_from_file, Laurent Vivier, 2020/12/14
- [PULL 12/19] block/file-posix: fix a possible undefined behavior, Laurent Vivier, 2020/12/14
- [PULL 06/19] fsdev: open brace '{' following struct go on the same line, Laurent Vivier, 2020/12/14
- Re: [PULL 00/19] Trivial branch for 6.0 patches, Peter Maydell, 2020/12/15