[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/11] bsd-user: Implement freebsd11_mknod, freebsd11_mknodat
From: |
Warner Losh |
Subject: |
[PATCH v2 04/11] bsd-user: Implement freebsd11_mknod, freebsd11_mknodat and mknodat |
Date: |
Fri, 24 Jun 2022 15:47:35 -0600 |
These implement both the old-pre INO64 mknod variations, as well as the
now current INO64 variant. To implement the old stuff, we use some
linker magic to bind to the old versions of these functions.
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/bsd-file.h | 47 +++++++++++++++++++++++++++++++++++
bsd-user/freebsd/os-syscall.c | 13 ++++++++++
2 files changed, 60 insertions(+)
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h
index 1af79866fc6..b05d3cbb717 100644
--- a/bsd-user/bsd-file.h
+++ b/bsd-user/bsd-file.h
@@ -721,4 +721,51 @@ static abi_long do_bsd_fchmodat(abi_long arg1, abi_long
arg2,
return ret;
}
+/* pre-ino64 mknod(2) */
+static abi_long do_bsd_freebsd11_mknod(abi_long arg1, abi_long arg2, abi_long
arg3)
+{
+ abi_long ret;
+ void *p;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(syscall(SYS_freebsd11_mknod, p, arg2, arg3));
+ UNLOCK_PATH(p, arg1);
+
+ return ret;
+}
+
+/* pre-ino64 mknodat(2) */
+static abi_long do_bsd_freebsd11_mknodat(abi_long arg1, abi_long arg2,
+ abi_long arg3, abi_long arg4)
+{
+ abi_long ret;
+ void *p;
+
+ LOCK_PATH(p, arg2);
+ ret = get_errno(syscall(SYS_freebsd11_mknodat, arg1, p, arg3, arg4));
+ UNLOCK_PATH(p, arg2);
+
+ return ret;
+}
+
+/* post-ino64 mknodat(2) */
+static abi_long do_bsd_mknodat(void *cpu_env, abi_long arg1,
+ abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5,
+ abi_long arg6)
+{
+ abi_long ret;
+ void *p;
+
+ LOCK_PATH(p, arg2);
+ /* 32-bit arch's use two 32 registers for 64 bit return value */
+ if (regpairs_aligned(cpu_env) != 0) {
+ ret = get_errno(mknodat(arg1, p, arg3, target_arg64(arg5, arg6)));
+ } else {
+ ret = get_errno(mknodat(arg1, p, arg3, target_arg64(arg4, arg5)));
+ }
+ UNLOCK_PATH(p, arg2);
+
+ return ret;
+}
+
#endif /* BSD_FILE_H */
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index b33d548a4b6..d3125f340f7 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -32,6 +32,7 @@
#include "qemu/cutils.h"
#include "qemu/path.h"
#include <sys/syscall.h>
+#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
@@ -418,6 +419,18 @@ static abi_long freebsd_syscall(void *cpu_env, int num,
abi_long arg1,
ret = do_bsd_fchmodat(arg1, arg2, arg3, arg4);
break;
+ case TARGET_FREEBSD_NR_freebsd11_mknod: /* mknod(2) */
+ ret = do_bsd_freebsd11_mknod(arg1, arg2, arg3);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_mknodat: /* mknodat(2) */
+ ret = do_bsd_freebsd11_mknodat(arg1, arg2, arg3, arg4);
+ break;
+
+ case TARGET_FREEBSD_NR_mknodat: /* mknodat(2) */
+ ret = do_bsd_mknodat(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
+ break;
+
default:
qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num);
ret = -TARGET_ENOSYS;
--
2.33.1
- [PATCH v2 00/11] bsd-user: More file-related system calls, Warner Losh, 2022/06/24
- [PATCH v2 01/11] bsd-user: Implement mount, umount and nmount, Warner Losh, 2022/06/24
- [PATCH v2 03/11] bsd-user: implement chmod, fchmod, lchmod and fchmodat, Warner Losh, 2022/06/24
- [PATCH v2 02/11] bsd-user: Implement symlink, symlinkat, readlink and readlinkat, Warner Losh, 2022/06/24
- [PATCH v2 04/11] bsd-user: Implement freebsd11_mknod, freebsd11_mknodat and mknodat,
Warner Losh <=
- [PATCH v2 07/11] bsd-user: Implement chroot and flock, Warner Losh, 2022/06/24
- [PATCH v2 10/11] bsd-user: Implement undelete, Warner Losh, 2022/06/24
- [PATCH v2 08/11] bsd-user: Implement mkfifo and mkfifoat, Warner Losh, 2022/06/24
- [PATCH v2 09/11] bsd-user: Implement pathconf, lpathconf and fpathconf, Warner Losh, 2022/06/24
- [PATCH v2 05/11] bsd-user: Implement chown, fchown, lchown and fchownat, Warner Losh, 2022/06/24
- [PATCH v2 06/11] bsd-user: Implement chflags, lchflags and fchflags, Warner Losh, 2022/06/24
- [PATCH v2 11/11] bsd-user: Remove stray 'inline' from do_bsd_close, Warner Losh, 2022/06/24