aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2020-11-18 18:10:51 +0100
committerLaurent Vivier <laurent@vivier.eu>2020-12-13 23:56:16 +0100
commit4a9d5f895adc25f043a382a3d5bf7237905d8991 (patch)
treed785c07d45fbbcc48d1fc532a88f0a2140e3d678
parent88c78f162a564ae17b3369b88c85e567d98ff9c7 (diff)
downloadqemu-4a9d5f895adc25f043a382a3d5bf7237905d8991.zip
qemu-4a9d5f895adc25f043a382a3d5bf7237905d8991.tar.gz
qemu-4a9d5f895adc25f043a382a3d5bf7237905d8991.tar.bz2
configure / meson: Move check for sys/kcov.h to meson.build
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>
-rwxr-xr-xconfigure9
-rw-r--r--linux-user/ioctls.h2
-rw-r--r--linux-user/syscall.c2
-rw-r--r--meson.build1
4 files changed, 3 insertions, 11 deletions
diff --git a/configure b/configure
index 4f0f9c9..6c13964 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 585874f..8efb4d3 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 27adee9..063130b 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 a790cc5..04cdea7 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