]> git.proxmox.com Git - mirror_qemu.git/commitdiff
9pfs: fix qemu_mknodat(S_IFREG) on macOS
authorChristian Schoenebeck <qemu_oss@crudebyte.com>
Fri, 29 Apr 2022 10:25:05 +0000 (12:25 +0200)
committerChristian Schoenebeck <qemu_oss@crudebyte.com>
Sat, 30 Apr 2022 11:11:48 +0000 (13:11 +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

index bec0253474db9b52dc16ca1c2dbc88567f57e412..e24d09763a4a9d3b53f9436fcc14bbbb55eb51ef 100644 (file)
@@ -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;