[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 01/13] 9p: linux: Fix a couple Linux assumptions
From: |
Keno Fischer |
Subject: |
[Qemu-devel] [PATCH v3 01/13] 9p: linux: Fix a couple Linux assumptions |
Date: |
Sat, 16 Jun 2018 20:56:45 -0400 |
From: Keno Fischer <address@hidden>
- 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 <address@hidden>
---
fsdev/file-op-9p.h | 2 +-
fsdev/virtfs-proxy-helper.c | 4 +++-
hw/9pfs/9p-local.c | 2 ++
include/qemu/statfs.h | 19 +++++++++++++++++++
include/qemu/xattr.h | 4 +++-
5 files changed, 28 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 3fa062b..111f804 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/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 6f132c5..94fb069 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -13,17 +13,19 @@
#include <sys/resource.h>
#include <getopt.h>
#include <syslog.h>
+#ifdef CONFIG_LINUX
#include <sys/capability.h>
#include <sys/fsuid.h>
-#include <sys/vfs.h>
#include <sys/ioctl.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
#include <linux/magic.h>
#endif
+#endif
#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/xattr.h"
+#include "qemu/statfs.h"
#include "9p-iov-marshal.h"
#include "hw/9pfs/9p-proxy.h"
#include "fsdev/9p-iov-marshal.h"
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 828e8d6..d713983 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -27,10 +27,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/include/qemu/statfs.h b/include/qemu/statfs.h
new file mode 100644
index 0000000..dde289f
--- /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 a83fe8e..f1d0f7b 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.8.1
- [Qemu-devel] [PATCH v3 00/13] 9p: Add support for Darwin, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 05/13] 9p: darwin: Explicitly cast comparisons of mode_t with -1, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 07/13] 9p: darwin: Provide a compatibility definition for XATTR_SIZE_MAX, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 03/13] 9p: darwin: Handle struct stat(fs) differences, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 08/13] 9p: darwin: *xattr_nofollow implementations, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 09/13] 9p: darwin: Compatibility for f/l*xattr, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 02/13] 9p: Rename 9p-util -> 9p-util-linux, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 01/13] 9p: linux: Fix a couple Linux assumptions,
Keno Fischer <=
- [Qemu-devel] [PATCH v3 06/13] 9p: darwin: Ignore O_{NOATIME, DIRECT}, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 11/13] 9p: darwin: Implement compatibility for mknodat, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 04/13] 9p: darwin: Handle struct dirent differences, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 10/13] 9p: darwin: Provide a fallback implementation for utimensat, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 13/13] 9p: darwin: configure: Allow VirtFS on Darwin, Keno Fischer, 2018/06/16
- [Qemu-devel] [PATCH v3 12/13] 9p: darwin: virtfs-proxy: Implement setuid code for darwin, Keno Fischer, 2018/06/16
- Re: [Qemu-devel] [PATCH v3 00/13] 9p: Add support for Darwin, no-reply, 2018/06/17