[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 2/7] 9pfs: fix qemu_mknodat(S_IFREG) on macOS
From: |
Christian Schoenebeck |
Subject: |
[PULL v2 2/7] 9pfs: fix qemu_mknodat(S_IFREG) on macOS |
Date: |
Sun, 01 May 2022 15:10:16 +0200 |
mknod() on macOS does not support creating regular files, so
divert to openat_file() if S_IFREG is passed with mode argument.
Furthermore, 'man 2 mknodat' on Linux says: "Zero file type is
equivalent to type S_IFREG".
Link: https://lore.kernel.org/qemu-devel/17933734.zYzKuhC07K@silver/
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Will Cohen <wwcohen@gmail.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id:
<3102ca936f88bc1f79d2a325e5bc68f48f54e6e3.1651228000.git.qemu_oss@crudebyte.com>
---
hw/9pfs/9p-util-darwin.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c
index bec0253474..e24d09763a 100644
--- a/hw/9pfs/9p-util-darwin.c
+++ b/hw/9pfs/9p-util-darwin.c
@@ -77,6 +77,15 @@ int fsetxattrat_nofollow(int dirfd, const char *filename,
const char *name,
int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
{
int preserved_errno, err;
+
+ if (S_ISREG(mode) || !(mode & S_IFMT)) {
+ int fd = openat_file(dirfd, filename, O_CREAT, mode);
+ if (fd == -1) {
+ return fd;
+ }
+ close(fd);
+ return 0;
+ }
if (!pthread_fchdir_np) {
error_report_once("pthread_fchdir_np() not available on this version
of macOS");
return -ENOTSUP;
--
2.30.2
- [PULL v2 0/7] 9p queue 2022-05-01 (previous 2022-04-30), Christian Schoenebeck, 2022/05/01
- [PULL v2 2/7] 9pfs: fix qemu_mknodat(S_IFREG) on macOS,
Christian Schoenebeck <=
- [PULL v2 1/7] 9pfs: fix inode sequencing in 'synth' driver, Christian Schoenebeck, 2022/05/01
- [PULL v2 3/7] 9pfs: fix qemu_mknodat(S_IFSOCK) on macOS, Christian Schoenebeck, 2022/05/01
- [PULL v2 4/7] 9pfs: fix wrong encoding of rdev field in Rgetattr on macOS, Christian Schoenebeck, 2022/05/01
- [PULL v2 5/7] 9pfs: fix wrong errno being sent to Linux client on macOS host, Christian Schoenebeck, 2022/05/01
- [PULL v2 6/7] 9pfs: fix removing non-existent POSIX ACL xattr on macOS host, Christian Schoenebeck, 2022/05/01
- [PULL v2 7/7] 9pfs: fix qemu_mknodat() to always return -1 on error on macOS host, Christian Schoenebeck, 2022/05/01
- Re: [PULL v2 0/7] 9p queue 2022-05-01 (previous 2022-04-30), Richard Henderson, 2022/05/01