Re: [PATCH 5/6] configure / meson: Move check for sys/signal.h to meson.build

[Laurent Vivier]

Le 18/11/2020 à 18:10, Thomas Huth a écrit :
> 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>
> ---
>  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 871e4bb9fb..8d40a0beb3 100755
> --- a/configure
> +++ b/configure
> @@ -4389,12 +4389,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
> @@ -6092,9 +6086,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 585874f090..8efb4d38c0 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 27adee908e..063130be04 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 054e40e9a5..ab9571a354 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -811,6 +811,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
> 

Applied to my trivial-patches branch with fixed subject.

Thanks,
Laurent