From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Laurent Vivier <laurent@vivier.eu>
Subject: [PATCH 6/6] configure / meson: Move check for linux/btrfs.h to meson.build
Date: Wed, 18 Nov 2020 18:10:52 +0100 [thread overview]
Message-ID: <20201118171052.308191-7-thuth@redhat.com> (raw)
In-Reply-To: <20201118171052.308191-1-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_BTRFS_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/syscall.c | 2 +-
linux-user/syscall_defs.h | 2 +-
meson.build | 1 +
4 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 8d40a0beb3..1ba4bf9a3d 100755
--- a/configure
+++ b/configure
@@ -4389,12 +4389,6 @@ if compile_prog "" "" ; then
syncfs=yes
fi
-# check for btrfs filesystem support (kernel must be 3.9+)
-btrfs=no
-if check_include linux/btrfs.h ; then
- btrfs=yes
-fi
-
# Search for bswap_32 function
byteswap_h=no
cat > $TMPC << EOF
@@ -6086,9 +6080,6 @@ fi
if test "$syncfs" = "yes" ; then
echo "CONFIG_SYNCFS=y" >> $config_host_mak
fi
-if test "$btrfs" = "yes" ; then
- echo "CONFIG_BTRFS=y" >> $config_host_mak
-fi
if test "$inotify" = "yes" ; then
echo "CONFIG_INOTIFY=y" >> $config_host_mak
fi
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 063130be04..7bf99beb18 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -112,7 +112,7 @@
#include <linux/if_alg.h>
#include <linux/rtc.h>
#include <sound/asound.h>
-#ifdef CONFIG_BTRFS
+#ifdef HAVE_BTRFS_H
#include <linux/btrfs.h>
#endif
#ifdef HAVE_DRM_H
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index cabbfb762d..b934d0b606 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1006,7 +1006,7 @@ struct target_rtc_pll_info {
#define TARGET_FS_IOC32_SETVERSION TARGET_IOW('v', 2, int)
/* btrfs ioctls */
-#ifdef CONFIG_BTRFS
+#ifdef HAVE_BTRFS_H
#define TARGET_BTRFS_IOC_SNAP_CREATE TARGET_IOWU(BTRFS_IOCTL_MAGIC, 1)
#define TARGET_BTRFS_IOC_SCAN_DEV TARGET_IOWU(BTRFS_IOCTL_MAGIC, 4)
#define TARGET_BTRFS_IOC_FORGET_DEV TARGET_IOWU(BTRFS_IOCTL_MAGIC, 5)
diff --git a/meson.build b/meson.build
index ab9571a354..bf62e260ed 100644
--- a/meson.build
+++ b/meson.build
@@ -808,6 +808,7 @@ config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('.')[0]
config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1])
config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2])
+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'))
config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
--
2.18.4
next prev parent reply other threads:[~2020-11-18 17:28 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 17:10 [PATCH 0/6] configure / meson: Move check for headers to meson.build Thomas Huth
2020-11-18 17:10 ` [PATCH 1/6] configure: Remove the obsolete check for ifaddrs.h Thomas Huth
2020-11-20 0:06 ` Richard Henderson
2020-12-13 17:56 ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 2/6] configure / meson: Move check for pty.h to meson.build Thomas Huth
2020-11-18 18:15 ` Philippe Mathieu-Daudé
2020-11-20 0:09 ` Richard Henderson
2020-12-13 17:57 ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 3/6] configure / meson: Move check for drm.h " Thomas Huth
2020-11-18 18:15 ` Philippe Mathieu-Daudé
2020-11-20 0:09 ` Richard Henderson
2020-12-13 17:58 ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 4/6] configure / meson: Move check for sys/signal.h " Thomas Huth
2020-11-18 18:16 ` Philippe Mathieu-Daudé
2020-11-20 0:10 ` Richard Henderson
2020-12-13 17:59 ` Laurent Vivier
2020-11-18 17:10 ` [PATCH 5/6] " Thomas Huth
2020-11-18 17:27 ` Eric Blake
2020-11-18 18:19 ` Philippe Mathieu-Daudé
2020-11-20 0:11 ` Richard Henderson
2020-12-13 18:01 ` Laurent Vivier
2020-11-18 17:10 ` Thomas Huth [this message]
2020-11-18 18:18 ` [PATCH 6/6] configure / meson: Move check for linux/btrfs.h " Philippe Mathieu-Daudé
2020-11-20 0:12 ` Richard Henderson
2020-12-13 18:02 ` Laurent Vivier
2020-11-18 17:20 ` [PATCH 0/6] configure / meson: Move check for headers " Paolo Bonzini
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=20201118171052.308191-7-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=laurent@vivier.eu \
--cc=pbonzini@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 NNTP newsgroup(s).