Re: [PATCH v2 1/5] 9pfs: fix qemu_mknodat(S_IFREG) on macOS

[Greg Kurz]

On Thu, 21 Apr 2022 17:07:38 +0200
Christian Schoenebeck  wrote:

> 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 
> Reviewed-by: Will Cohen 
> ---

Reviewed-by: Greg Kurz 

>  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;

[PATCH v2 1/5] 9pfs: fix qemu_mknodat(S_IFREG) on macOS

[Christian Schoenebeck]

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 
Reviewed-by: Will Cohen 
---
 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.32.0 (Apple Git-132)