]> git.proxmox.com Git - mirror_qemu.git/commit - configure
configure: Check if struct fsxattr is available from linux header
authorJan Vesely <jano.vesely@gmail.com>
Fri, 29 Apr 2016 17:15:23 +0000 (13:15 -0400)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 2 May 2016 12:04:26 +0000 (13:04 +0100)
commit277abf15a60f7653bfb05ffb513ed74ffdaea1b7
treefb362a05a2b32472178cb69af5b10e9202cea6c2
parent20b0f5fef66012e12bde32b14eaa64de2b1b9dbe
configure: Check if struct fsxattr is available from linux header

Fixes build failure with --enable-xfsctl and
new linux headers (>=4.5) and older xfsprogs(<4.5):
In file included from /usr/include/xfs/xfs.h:38:0,
                 from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:97:
/usr/include/xfs/xfs_fs.h:42:8: error: redefinition of ‘struct fsxattr’
 struct fsxattr {
        ^
In file included from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:60:0:
/usr/include/linux/fs.h:155:8: note: originally defined here
 struct fsxattr {

This is really a bug in the system headers, but we can work around it
by defining HAVE_FSXATTR in the QEMU headers if linux/fs.h provides
the struct, so that xfs_fs.h doesn't try to define it as well.

CC: qemu-trivial@nongnu.org
CC: Markus Armbruster <armbru@redhat.com>
CC: Peter Maydell <peter.maydell@linaro.org>
CC: Stefan Weil <sw@weilnetz.de>
Tested-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
[PMM: adjusted commit message, comments]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
configure