From: Paolo Bonzini <pbonzini@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH 19/26] configure: convert compiler tests to meson, part 1
Date: Tue, 15 Jun 2021 17:15:36 +0200 [thread overview]
Message-ID: <c119b15d-fd19-962c-08a6-d25fe30ccc82@redhat.com> (raw)
In-Reply-To: <YMjAYMEGpegs05Dr@redhat.com>
On 15/06/21 16:59, Daniel P. Berrangé wrote:
>> config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
>>
>> +config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))
>
> Why add this here rather than with the other CONFIG_ checks ?
Because despite the different name it's just a header check. I chose to
keep similar cc.has_* symbols together, and sorthed them alphabetically.
It should in theory make it easier to look for examples when adding
new tests to meson.build.
>> config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h'))
>> 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'))
>> @@ -1267,9 +1270,39 @@ config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.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('CONFIG_CLOCK_ADJTIME', cc.has_function('clock_adjtime'))
>> +config_host_data.set('CONFIG_DUP3', cc.has_function('dup3'))
>> +config_host_data.set('CONFIG_FALLOCATE', cc.has_function('fallocate'))
>> +config_host_data.set('CONFIG_POSIX_FALLOCATE', cc.has_function('posix_fallocate'))
>> +config_host_data.set('CONFIG_PPOLL', cc.has_function('ppoll'))
>> config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>'))
>> +config_host_data.set('CONFIG_SENDFILE', cc.has_function('sendfile'))
>> +config_host_data.set('CONFIG_SETNS', cc.has_function('setns') and cc.has_function('unshare'))
>> +config_host_data.set('CONFIG_SYNCFS', cc.has_function('syncfs'))
>> +config_host_data.set('CONFIG_SYNC_FILE_RANGE', cc.has_function('sync_file_range'))
>> +config_host_data.set('CONFIG_TIMERFD', cc.has_function('timerfd_create'))
>> +config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util))
>> config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>'))
>
> This function looks even more out of place
>
>>
>> +config_host_data.set('CONFIG_BYTESWAP_H',
>> + cc.has_header_symbol('byteswap.h', 'bswap_32'))
>> +config_host_data.set('CONFIG_EPOLL_CREATE1',
>> + cc.has_header_symbol('sys/epoll.h', 'epoll_create1'))
>
> Why not sort next to CONFIG_EPOLL
>
>> +config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE',
>> + cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUNCH_HOLE') and
>> + cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_KEEP_SIZE'))
>> +config_host_data.set('CONFIG_FALLOCATE_ZERO_RANGE',
>> + cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_ZERO_RANGE'))
>
> And next to CONFIG_FALLOCATE ?
>
>> +config_host_data.set('CONFIG_FIEMAP',
>> + cc.has_header('linux/fiemap.h') and
>> + cc.has_header_symbol('linux/fs.h', 'FS_IOC_FIEMAP'))
>> +config_host_data.set('CONFIG_MACHINE_BSWAP_H',
>> + cc.has_header_symbol('machine/bswap.h', 'bswap32',
>> + prefix: '''#include <sys/endian.h>
>> + #include <sys/types.h>'''))
>> +config_host_data.set('CONFIG_PRCTL_PR_SET_TIMERSLACK',
>> + cc.has_header_symbol('sys/prctl.h', 'PR_SET_TIMERSLACK'))
>> +
>> # Some versions of Mac OS X incorrectly define SIZE_MAX
>> config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
>> #include <stdint.h>
>> diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
>> index 47fdae5b21..cf65a0b161 100644
>> --- a/ui/vnc-auth-sasl.c
>> +++ b/ui/vnc-auth-sasl.c
>> @@ -33,7 +33,7 @@
>> * files that use SASL API need to disable -Wdeprecated-declarations.
>> */
>> #ifdef CONFIG_DARWIN
>> -#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
>> +#pragma GCC diagnostic warning "-Wdeprecated-declarations"
>
> Why this change now ?
Botched rebase.
>> #endif
>>
>> /* Max amount of data we send/recv for SASL steps to prevent DOS */
>> diff --git a/util/meson.build b/util/meson.build
>> index 97fad44105..7fe9da60ab 100644
>> --- a/util/meson.build
>> +++ b/util/meson.build
>> @@ -3,7 +3,9 @@ util_ss.add(files('osdep.c', 'cutils.c', 'unicode.c', 'qemu-timer-common.c'))
>> util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c'))
>> util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c'))
>> util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c'))
>> -util_ss.add(when: 'CONFIG_EPOLL_CREATE1', if_true: files('fdmon-epoll.c'))
>> +if config_host_data.get('CONFIG_EPOLL_CREATE1')
>> + util_ss.add(files('fdmon-epoll.c'))
>> +endif
>
>
> Why does this need to change ?
Because CONFIG_EPOLL_CREATE1 is not anymore part of config-host.mak
(which is where config_host comes from; "when" clauses look at config_host).
>> util_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: files('fdmon-io_uring.c'))
>> util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c'))
>> util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c'))
>
> Regards,
> Daniel
>
next prev parent reply other threads:[~2021-06-15 15:17 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 11:22 [PATCH 00/22] Convert more checks to Meson Paolo Bonzini
2021-06-08 11:22 ` [PATCH 01/26] meson: drop unused CONFIG_GCRYPT_HMAC Paolo Bonzini
2021-06-08 17:37 ` Richard Henderson
2021-06-15 13:53 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 02/26] configure: drop unused variables for xts Paolo Bonzini
2021-06-08 12:15 ` Philippe Mathieu-Daudé
2021-06-08 17:38 ` Richard Henderson
2021-06-15 13:55 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 03/26] configure, meson: convert crypto detection to meson Paolo Bonzini
2021-06-08 19:16 ` Richard Henderson
2021-06-15 14:01 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 04/26] configure, meson: convert libtasn1 " Paolo Bonzini
2021-06-08 19:32 ` Richard Henderson
2021-06-15 14:04 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 05/26] configure, meson: convert pam " Paolo Bonzini
2021-06-08 19:45 ` Richard Henderson
2021-06-08 19:47 ` Richard Henderson
2021-06-08 20:20 ` Daniel P. Berrangé
2021-06-09 15:46 ` Richard Henderson
2021-06-09 15:57 ` Daniel P. Berrangé
2021-06-09 16:47 ` Richard Henderson
2021-06-15 13:58 ` Paolo Bonzini
2021-06-15 14:05 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 06/26] configure, meson: convert libusb " Paolo Bonzini
2021-06-15 14:06 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 07/26] configure, meson: convert libcacard " Paolo Bonzini
2021-06-15 14:08 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 08/26] configure, meson: convert libusbredir " Paolo Bonzini
2021-06-15 14:09 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 09/26] configure, meson: convert vte " Paolo Bonzini
2021-06-15 14:24 ` Daniel P. Berrangé
2021-06-15 15:12 ` Paolo Bonzini
2021-06-08 11:22 ` [PATCH 10/26] configure, meson: convert virgl " Paolo Bonzini
2021-06-15 14:25 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 11/26] configure, meson: convert libdaxctl " Paolo Bonzini
2021-06-15 14:37 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 12/26] configure, meson: convert libpmem " Paolo Bonzini
2021-06-15 14:37 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 13/26] configure, meson: convert liburing " Paolo Bonzini
2021-06-15 14:38 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 14/26] configure, meson: convert libxml2 " Paolo Bonzini
2021-06-15 14:44 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 15/26] meson: sort header tests Paolo Bonzini
2021-06-08 12:15 ` Philippe Mathieu-Daudé
2021-06-15 14:47 ` Daniel P. Berrangé
2021-06-15 15:16 ` Paolo Bonzini
2021-06-15 15:50 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 16/26] meson: remove preadv from summary Paolo Bonzini
2021-06-15 14:48 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 17/26] configure, meson: move CONFIG_IVSHMEM to meson Paolo Bonzini
2021-06-15 14:50 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 18/26] configure: convert HAVE_BROKEN_SIZE_MAX " Paolo Bonzini
2021-06-15 14:51 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 19/26] configure: convert compiler tests to meson, part 1 Paolo Bonzini
2021-06-15 14:59 ` Daniel P. Berrangé
2021-06-15 15:15 ` Paolo Bonzini [this message]
2021-06-08 11:22 ` [PATCH 20/26] meson: store dependency('threads') in a variable Paolo Bonzini
2021-06-15 15:02 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 21/26] configure: convert compiler tests to meson, part 2 Paolo Bonzini
2021-06-15 15:03 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 22/26] configure: convert compiler tests to meson, part 3 Paolo Bonzini
2021-06-15 15:08 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 23/26] configure: convert CONFIG_STATIC_ASSERT tests to meson Paolo Bonzini
2021-06-08 12:17 ` Philippe Mathieu-Daudé
2021-06-15 15:08 ` Daniel P. Berrangé
2021-06-08 11:22 ` [PATCH 24/26] configure: convert compiler tests to meson, part 4 Paolo Bonzini
2021-06-15 15:13 ` Daniel P. Berrangé
2021-06-08 11:23 ` [PATCH 25/26] configure: convert compiler tests to meson, part 5 Paolo Bonzini
2021-06-15 15:15 ` Daniel P. Berrangé
2021-06-08 11:23 ` [PATCH 26/26] configure: convert compiler tests to meson, part 6 Paolo Bonzini
2021-06-15 15:17 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c119b15d-fd19-962c-08a6-d25fe30ccc82@redhat.com \
--to=pbonzini@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).