On Sun, 6 Feb 2022 15:07:09 -0500 Will Cohen <wwco...@gmail.com> wrote:
> From: Keno Fischer <k...@juliacomputing.com> > > - Guard Linux only headers. > - Add qemu/statfs.h header to abstract over the which > headers are needed for struct statfs > - Define `ENOATTR` only if not only defined > (it's defined in system headers on Darwin). > > Signed-off-by: Keno Fischer <k...@juliacomputing.com> > [Michael Roitzsch: - Rebase for NixOS] > Signed-off-by: Michael Roitzsch <reactorcont...@icloud.com> > > While it might at first appear that fsdev/virtfs-proxy-header.c would > need similar adjustment for darwin as file-op-9p here, a later patch in > this series disables virtfs-proxy-helper for non-Linux. Allowing > virtfs-proxy-helper on darwin could potentially be an additional > optimization later. > > [Will Cohen: - Fix headers for Alpine > - Integrate statfs.h back into file-op-9p.h > - Remove superfluous header guards from file-opt-9p > - Add note about virtfs-proxy-helper being disabled > on non-Linux for this patch series] > Signed-off-by: Will Cohen <wwco...@gmail.com> > --- Reviewed-by: Greg Kurz <gr...@kaod.org> > fsdev/file-op-9p.h | 9 ++++++++- > hw/9pfs/9p-local.c | 2 ++ > hw/9pfs/9p.c | 4 ++++ > include/qemu/xattr.h | 4 +++- > 4 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h > index 8fd89f0447..4997677460 100644 > --- a/fsdev/file-op-9p.h > +++ b/fsdev/file-op-9p.h > @@ -16,10 +16,17 @@ > > #include <dirent.h> > #include <utime.h> > -#include <sys/vfs.h> > #include "qemu-fsdev-throttle.h" > #include "p9array.h" > > +#ifdef CONFIG_LINUX > +# include <sys/vfs.h> > +#endif > +#ifdef CONFIG_DARWIN > +# include <sys/param.h> > +# include <sys/mount.h> > +#endif > + > #define SM_LOCAL_MODE_BITS 0600 > #define SM_LOCAL_DIR_MODE_BITS 0700 > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > index 210d9e7705..1a5e3eed73 100644 > --- a/hw/9pfs/9p-local.c > +++ b/hw/9pfs/9p-local.c > @@ -32,10 +32,12 @@ > #include "qemu/error-report.h" > #include "qemu/option.h" > #include <libgen.h> > +#ifdef CONFIG_LINUX > #include <linux/fs.h> > #ifdef CONFIG_LINUX_MAGIC_H > #include <linux/magic.h> > #endif > +#endif > #include <sys/ioctl.h> > > #ifndef XFS_SUPER_MAGIC > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index 15b3f4d385..9c63e14b28 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -32,7 +32,11 @@ > #include "migration/blocker.h" > #include "qemu/xxhash.h" > #include <math.h> > +#ifdef CONFIG_LINUX > #include <linux/limits.h> > +#else > +#include <limits.h> > +#endif > > int open_fd_hw; > int total_open_fd; > diff --git a/include/qemu/xattr.h b/include/qemu/xattr.h > index a83fe8e749..f1d0f7be74 100644 > --- a/include/qemu/xattr.h > +++ b/include/qemu/xattr.h > @@ -22,7 +22,9 @@ > #ifdef CONFIG_LIBATTR > # include <attr/xattr.h> > #else > -# define ENOATTR ENODATA > +# if !defined(ENOATTR) > +# define ENOATTR ENODATA > +# endif > # include <sys/xattr.h> > #endif >
