[Qemu-commits] [qemu/qemu] 277abf: configure: Check if struct fsxattr is available fr...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 277abf15a60f7653bfb05ffb513ed74ffdaea1b7
      
https://github.com/qemu/qemu/commit/277abf15a60f7653bfb05ffb513ed74ffdaea1b7
  Author: Jan Vesely <address@hidden>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  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: address@hidden
CC: Markus Armbruster <address@hidden>
CC: Peter Maydell <address@hidden>
CC: Stefan Weil <address@hidden>
Tested-by: Stefan Weil <address@hidden>
Signed-off-by: Jan Vesely <address@hidden>
[PMM: adjusted commit message, comments]
Signed-off-by: Peter Maydell <address@hidden>