All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Cohen <wwcohen@gmail.com>
To: qemu-devel@nongnu.org
Cc: Keno Fischer <keno@alumni.harvard.edu>,
	Keno Fischer <keno@juliacomputing.com>
Subject: [PATCH 01/11] 9p: linux: Fix a couple Linux assumptions
Date: Wed, 13 Oct 2021 19:03:55 -0400	[thread overview]
Message-ID: <20211013230405.32170-2-wwcohen@gmail.com> (raw)
In-Reply-To: <20211013230405.32170-1-wwcohen@gmail.com>

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>
---
 fsdev/file-op-9p.h    |  2 +-
 hw/9pfs/9p-local.c    |  2 ++
 hw/9pfs/9p.c          |  2 +-
 include/qemu/statfs.h | 19 +++++++++++++++++++
 include/qemu/xattr.h  |  4 +++-
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 include/qemu/statfs.h

diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h
index 42f677cf38..d9d058b756 100644
--- a/fsdev/file-op-9p.h
+++ b/fsdev/file-op-9p.h
@@ -16,7 +16,7 @@
 
 #include <dirent.h>
 #include <utime.h>
-#include <sys/vfs.h>
+#include "qemu/statfs.h"
 #include "qemu-fsdev-throttle.h"
 
 #define SM_LOCAL_MODE_BITS    0600
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 c857b31321..2f0e960162 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -32,7 +32,7 @@
 #include "migration/blocker.h"
 #include "qemu/xxhash.h"
 #include <math.h>
-#include <linux/limits.h>
+#include <limits.h>
 
 int open_fd_hw;
 int total_open_fd;
diff --git a/include/qemu/statfs.h b/include/qemu/statfs.h
new file mode 100644
index 0000000000..dde289f9bb
--- /dev/null
+++ b/include/qemu/statfs.h
@@ -0,0 +1,19 @@
+/*
+ * Host statfs header abstraction
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2, or any
+ * later version.  See the COPYING file in the top-level directory.
+ *
+ */
+#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
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
 
-- 
2.33.0



  reply	other threads:[~2021-10-14  1:03 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-13 23:03 [PATCH 00/11] 9p: Add support for Darwin Will Cohen
2021-10-13 23:03 ` Will Cohen [this message]
2021-10-13 23:03 ` [PATCH 02/11] 9p: Rename 9p-util -> 9p-util-linux Will Cohen
2021-10-13 23:03 ` [PATCH 03/11] 9p: darwin: Handle struct stat(fs) differences Will Cohen
2021-10-13 23:03 ` [PATCH 04/11] 9p: darwin: Handle struct dirent differences Will Cohen
2021-10-13 23:03 ` [PATCH 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT} Will Cohen
2021-10-13 23:04 ` [PATCH 06/11] 9p: darwin: Compatibility defn for XATTR_SIZE_MAX Will Cohen
2021-10-13 23:04 ` [PATCH 07/11] 9p: darwin: *xattr_nofollow implementations Will Cohen
2021-10-13 23:04 ` [PATCH 08/11] 9p: darwin: Compatibility for f/l*xattr Will Cohen
2021-10-13 23:04 ` [PATCH 09/11] 9p: darwin: Provide a fallback implementation for utimensat Will Cohen
2021-10-13 23:04 ` [PATCH 10/11] 9p: darwin: Implement compatibility for mknodat Will Cohen
2021-10-13 23:04 ` [PATCH 11/11] 9p: darwin: meson: Allow VirtFS on Darwin Will Cohen
2021-10-15 12:10   ` Paolo Bonzini
2021-10-14  7:03 ` [PATCH 00/11] 9p: Add support for Darwin Greg Kurz
2021-10-14 10:48   ` Will Cohen
2021-10-14 11:57     ` Christian Schoenebeck
2021-10-14 12:22       ` Will Cohen
2021-10-14 12:55         ` Christian Schoenebeck
2021-10-14 13:23           ` Will Cohen
2021-10-20 12:38             ` Christian Schoenebeck

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=20211013230405.32170-2-wwcohen@gmail.com \
    --to=wwcohen@gmail.com \
    --cc=keno@alumni.harvard.edu \
    --cc=keno@juliacomputing.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.