| Message ID | 20220128005611.87185-2-wwcohen@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | This is a followup to https://lists.gnu.org/archive/html/qemu-devel/2021-11/msg04325.html, | expand |
On Thu, 27 Jan 2022 19:56:01 -0500 Will Cohen <wwcohen@gmail.com> wrote: > From: Keno Fischer <keno@alumni.harvard.edu> > > - 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 <keno@juliacomputing.com> > [Michael Roitzsch: - Rebase for NixOS] > Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> > [Will Cohen: - Fix headers for Alpine > - Integrate statfs.h back into file-op-9p.h] > Signed-off-by: Will Cohen <wwcohen@gmail.com> > --- > fsdev/file-op-9p.h | 15 ++++++++++++++- > hw/9pfs/9p-local.c | 2 ++ > hw/9pfs/9p.c | 4 ++++ > include/qemu/xattr.h | 4 +++- fsdev/virtfs-proxy-helper.c would need similar fixing in theory but patch 10 disables the build for non-linux. Maybe just mention it in the changelog so that people know this is deliberate. Apart from that, LGTM. > 4 files changed, 23 insertions(+), 2 deletions(-) > > diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h > index 8fd89f0447..616c6f503f 100644 > --- a/fsdev/file-op-9p.h > +++ b/fsdev/file-op-9p.h > @@ -16,10 +16,23 @@ > > #include <dirent.h> > #include <utime.h> > -#include <sys/vfs.h> > #include "qemu-fsdev-throttle.h" > #include "p9array.h" > > +#ifndef QEMU_STATFS_H > +#define QEMU_STATFS_H > + Include guards from the old header file don't make sense anymore here. You should drop them. > +#ifdef CONFIG_LINUX > +# include <sys/vfs.h> > +#endif > +#ifdef CONFIG_DARWIN > +# include <sys/param.h> > +# include <sys/mount.h> > +#endif > + > +#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 >
diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 8fd89f0447..616c6f503f 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -16,10 +16,23 @@ #include <dirent.h> #include <utime.h> -#include <sys/vfs.h> #include "qemu-fsdev-throttle.h" #include "p9array.h" +#ifndef QEMU_STATFS_H +#define QEMU_STATFS_H + +#ifdef CONFIG_LINUX +# include <sys/vfs.h> +#endif +#ifdef CONFIG_DARWIN +# include <sys/param.h> +# include <sys/mount.h> +#endif + +#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