[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/11] 9p: darwin: Compatibility for f/l*xattr
From: |
Will Cohen |
Subject: |
[PATCH v4 08/11] 9p: darwin: Compatibility for f/l*xattr |
Date: |
Sun, 6 Feb 2022 15:07:16 -0500 |
From: Keno Fischer <keno@juliacomputing.com>
On darwin `fgetxattr` takes two extra optional arguments,
and the l* variants are not defined (in favor of an extra
flag to the regular variants.
Signed-off-by: Keno Fischer <keno@juliacomputing.com>
[Michael Roitzsch: - Rebase for NixOS]
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
Signed-off-by: Will Cohen <wwcohen@gmail.com>
---
hw/9pfs/9p-local.c | 12 ++++++++----
hw/9pfs/9p-util.h | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 7137a28109..ea3ded5fca 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -790,16 +790,20 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
mode_t tmp_mode;
dev_t tmp_dev;
- if (fgetxattr(fd, "user.virtfs.uid", &tmp_uid, sizeof(uid_t)) > 0) {
+ if (qemu_fgetxattr(fd, "user.virtfs.uid",
+ &tmp_uid, sizeof(uid_t)) > 0) {
stbuf->st_uid = le32_to_cpu(tmp_uid);
}
- if (fgetxattr(fd, "user.virtfs.gid", &tmp_gid, sizeof(gid_t)) > 0) {
+ if (qemu_fgetxattr(fd, "user.virtfs.gid",
+ &tmp_gid, sizeof(gid_t)) > 0) {
stbuf->st_gid = le32_to_cpu(tmp_gid);
}
- if (fgetxattr(fd, "user.virtfs.mode", &tmp_mode, sizeof(mode_t)) > 0) {
+ if (qemu_fgetxattr(fd, "user.virtfs.mode",
+ &tmp_mode, sizeof(mode_t)) > 0) {
stbuf->st_mode = le32_to_cpu(tmp_mode);
}
- if (fgetxattr(fd, "user.virtfs.rdev", &tmp_dev, sizeof(dev_t)) > 0) {
+ if (qemu_fgetxattr(fd, "user.virtfs.rdev",
+ &tmp_dev, sizeof(dev_t)) > 0) {
stbuf->st_rdev = le64_to_cpu(tmp_dev);
}
} else if (fs_ctx->export_flags & V9FS_SM_MAPPED_FILE) {
diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h
index 3b9c485414..8e610ad224 100644
--- a/hw/9pfs/9p-util.h
+++ b/hw/9pfs/9p-util.h
@@ -19,6 +19,23 @@
#define O_PATH_9P_UTIL 0
#endif
+#ifdef CONFIG_DARWIN
+#define qemu_fgetxattr(...) fgetxattr(__VA_ARGS__, 0, 0)
+#define qemu_lgetxattr(...) getxattr(__VA_ARGS__, 0, XATTR_NOFOLLOW)
+#define qemu_llistxattr(...) listxattr(__VA_ARGS__, XATTR_NOFOLLOW)
+#define qemu_lremovexattr(...) removexattr(__VA_ARGS__, XATTR_NOFOLLOW)
+static inline int qemu_lsetxattr(const char *path, const char *name,
+ const void *value, size_t size, int flags) {
+ return setxattr(path, name, value, size, 0, flags | XATTR_NOFOLLOW);
+}
+#else
+#define qemu_fgetxattr fgetxattr
+#define qemu_lgetxattr lgetxattr
+#define qemu_llistxattr llistxattr
+#define qemu_lremovexattr lremovexattr
+#define qemu_lsetxattr lsetxattr
+#endif
+
static inline void close_preserve_errno(int fd)
{
int serrno = errno;
--
2.32.0 (Apple Git-132)
- [PATCH v4 01/11] 9p: linux: Fix a couple Linux assumptions, (continued)
- [PATCH v4 08/11] 9p: darwin: Compatibility for f/l*xattr,
Will Cohen <=
- [PATCH v4 06/11] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX, Will Cohen, 2022/02/06
- [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/06
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Philippe Mathieu-Daudé, 2022/02/06
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/06
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Greg Kurz, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Philippe Mathieu-Daudé, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Greg Kurz, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Dr. David Alan Gilbert, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Christian Schoenebeck, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/07