All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Greg Kurz <groug@kaod.org>
Subject: [PULL 2/7] 9pfs: fix qemu_mknodat(S_IFREG) on macOS
Date: Sat, 30 Apr 2022 13:44:42 +0200	[thread overview]
Message-ID: <096af171274cc76c51bf11366ae257391ddfed2a.1651319081.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1651319081.git.qemu_oss@crudebyte.com>

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



  parent reply	other threads:[~2022-04-30 12:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-30 11:44 [PULL 0/7] 9p queue 2022-04-30 Christian Schoenebeck
2022-04-30 11:44 ` [PULL 5/7] 9pfs: fix wrong errno being sent to Linux client on macOS host Christian Schoenebeck
2022-04-30 11:44 ` [PULL 6/7] 9pfs: fix removing non-existent POSIX ACL xattr " Christian Schoenebeck
2022-04-30 11:44 ` [PULL 3/7] 9pfs: fix qemu_mknodat(S_IFSOCK) on macOS Christian Schoenebeck
2022-04-30 11:44 ` [PULL 7/7] 9pfs: fix qemu_mknodat() to always return -1 on error on macOS host Christian Schoenebeck
2022-04-30 11:44 ` [PULL 4/7] 9pfs: fix wrong encoding of rdev field in Rgetattr on macOS Christian Schoenebeck
2022-04-30 11:44 ` Christian Schoenebeck [this message]
2022-04-30 11:44 ` [PULL 1/7] 9pfs: fix inode sequencing in 'synth' driver Christian Schoenebeck
2022-04-30 16:37 ` [PULL 0/7] 9p queue 2022-04-30 Richard Henderson
2022-04-30 19:29   ` Christian Schoenebeck
2022-04-30 20:16     ` Richard Henderson

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=096af171274cc76c51bf11366ae257391ddfed2a.1651319081.git.qemu_oss@crudebyte.com \
    --to=qemu_oss@crudebyte.com \
    --cc=groug@kaod.org \
    --cc=peter.maydell@linaro.org \
    --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.