* [PULL 01/36] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 02/36] bsd-user: Remove image_info.mmap Warner Losh
` (35 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Richard Henderson, Philippe Mathieu-Daudé
From: Richard Henderson <richard.henderson@linaro.org>
The start_mmap value is write-only.
Remove the field and the defines that populated it.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230818175736.144194-2-richard.henderson@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/arm/target_arch_elf.h | 1 -
bsd-user/elfload.c | 1 -
bsd-user/i386/target_arch_elf.h | 1 -
bsd-user/qemu.h | 1 -
bsd-user/x86_64/target_arch_elf.h | 1 -
5 files changed, 5 deletions(-)
diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h
index 935bce347fc..b1c0fd2b320 100644
--- a/bsd-user/arm/target_arch_elf.h
+++ b/bsd-user/arm/target_arch_elf.h
@@ -20,7 +20,6 @@
#ifndef TARGET_ARCH_ELF_H
#define TARGET_ARCH_ELF_H
-#define ELF_START_MMAP 0x80000000
#define ELF_ET_DYN_LOAD_ADDR 0x500000
#define elf_check_arch(x) ((x) == EM_ARM)
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 1f650bdde85..38a3439d2cd 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
/* OK, This is the point of no return */
info->end_data = 0;
info->end_code = 0;
- info->start_mmap = (abi_ulong)ELF_START_MMAP;
info->mmap = 0;
elf_entry = (abi_ulong) elf_ex.e_entry;
diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h
index cbcd1f08e2f..4ac27b02e72 100644
--- a/bsd-user/i386/target_arch_elf.h
+++ b/bsd-user/i386/target_arch_elf.h
@@ -20,7 +20,6 @@
#ifndef TARGET_ARCH_ELF_H
#define TARGET_ARCH_ELF_H
-#define ELF_START_MMAP 0x80000000
#define ELF_ET_DYN_LOAD_ADDR 0x01001000
#define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486))
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8f2d6a3c78b..178114b4234 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -52,7 +52,6 @@ struct image_info {
abi_ulong end_data;
abi_ulong start_brk;
abi_ulong brk;
- abi_ulong start_mmap;
abi_ulong mmap;
abi_ulong rss;
abi_ulong start_stack;
diff --git a/bsd-user/x86_64/target_arch_elf.h b/bsd-user/x86_64/target_arch_elf.h
index b2447118883..e51c2faf084 100644
--- a/bsd-user/x86_64/target_arch_elf.h
+++ b/bsd-user/x86_64/target_arch_elf.h
@@ -20,7 +20,6 @@
#ifndef TARGET_ARCH_ELF_H
#define TARGET_ARCH_ELF_H
-#define ELF_START_MMAP 0x2aaaaab000ULL
#define ELF_ET_DYN_LOAD_ADDR 0x01021000
#define elf_check_arch(x) (((x) == ELF_ARCH))
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 02/36] bsd-user: Remove image_info.mmap
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
2023-08-28 23:37 ` [PULL 01/36] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 03/36] bsd-user: Remove image_info.start_brk Warner Losh
` (34 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Richard Henderson, Philippe Mathieu-Daudé
From: Richard Henderson <richard.henderson@linaro.org>
This value is unused.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230818175736.144194-3-richard.henderson@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/elfload.c | 1 -
bsd-user/qemu.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 38a3439d2cd..2d39e59258e 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
/* OK, This is the point of no return */
info->end_data = 0;
info->end_code = 0;
- info->mmap = 0;
elf_entry = (abi_ulong) elf_ex.e_entry;
/* XXX Join this with PT_INTERP search? */
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 178114b4234..898fe3e8b34 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -52,7 +52,6 @@ struct image_info {
abi_ulong end_data;
abi_ulong start_brk;
abi_ulong brk;
- abi_ulong mmap;
abi_ulong rss;
abi_ulong start_stack;
abi_ulong entry;
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 03/36] bsd-user: Remove image_info.start_brk
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
2023-08-28 23:37 ` [PULL 01/36] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap Warner Losh
2023-08-28 23:37 ` [PULL 02/36] bsd-user: Remove image_info.mmap Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 04/36] bsd-user: Move _WANT_FREEBSD macros to include/qemu/osdep.h Warner Losh
` (33 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Richard Henderson, Philippe Mathieu-Daudé
From: Richard Henderson <richard.henderson@linaro.org>
This has the same value is image_info.brk, which is also logged,
and is otherwise unused.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230818175736.144194-4-richard.henderson@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/elfload.c | 2 +-
bsd-user/main.c | 2 --
bsd-user/qemu.h | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 2d39e59258e..baf2f63d2f1 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -811,7 +811,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs,
bprm->stringp, &elf_ex, load_addr,
et_dyn_addr, interp_load_addr, info);
info->load_addr = reloc_func_desc;
- info->start_brk = info->brk = elf_brk;
+ info->brk = elf_brk;
info->start_stack = bprm->p;
info->load_bias = 0;
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 381bb18df80..f913cb55a72 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -553,8 +553,6 @@ int main(int argc, char **argv)
fprintf(f, "page layout changed following binary load\n");
page_dump(f);
- fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n",
- info->start_brk);
fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n",
info->end_code);
fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n",
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 898fe3e8b34..61501c321b0 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -50,7 +50,6 @@ struct image_info {
abi_ulong end_code;
abi_ulong start_data;
abi_ulong end_data;
- abi_ulong start_brk;
abi_ulong brk;
abi_ulong rss;
abi_ulong start_stack;
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 04/36] bsd-user: Move _WANT_FREEBSD macros to include/qemu/osdep.h
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (2 preceding siblings ...)
2023-08-28 23:37 ` [PULL 03/36] bsd-user: Remove image_info.start_brk Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 05/36] bsd-user: Disable clang warnings Warner Losh
` (32 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
move _WANT_FREEBSD macros from bsd-user/freebsd/os-syscall.c to
include/qemu/osdep.h in order to pull some struct defintions needed
later in the build.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/os-syscall.c | 11 -----------
include/qemu/osdep.h | 13 +++++++++++++
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index de36c4b71c6..2224a280ea2 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -17,17 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-
-/*
- * We need the FreeBSD "legacy" definitions. Rust needs the FreeBSD 11 system
- * calls since it doesn't use libc at all, so we have to emulate that despite
- * FreeBSD 11 being EOL'd.
- */
-#define _WANT_FREEBSD11_STAT
-#define _WANT_FREEBSD11_STATFS
-#define _WANT_FREEBSD11_DIRENT
-#define _WANT_KERNEL_ERRNO
-#define _WANT_SEMUN
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/path.h"
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 21ef8f16995..2cae135280c 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -88,6 +88,19 @@ QEMU_EXTERN_C int daemon(int, int);
#define __USE_MINGW_ANSI_STDIO 1
#endif
+/*
+ * We need the FreeBSD "legacy" definitions. Rust needs the FreeBSD 11 system
+ * calls since it doesn't use libc at all, so we have to emulate that despite
+ * FreeBSD 11 being EOL'd.
+ */
+#ifdef __FreeBSD__
+#define _WANT_FREEBSD11_STAT
+#define _WANT_FREEBSD11_STATFS
+#define _WANT_FREEBSD11_DIRENT
+#define _WANT_KERNEL_ERRNO
+#define _WANT_SEMUN
+#endif
+
#include <stdarg.h>
#include <stddef.h>
#include <stdbool.h>
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 05/36] bsd-user: Disable clang warnings
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (3 preceding siblings ...)
2023-08-28 23:37 ` [PULL 04/36] bsd-user: Move _WANT_FREEBSD macros to include/qemu/osdep.h Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 06/36] bsd-user; Update the definitions of __put_user and __get_user macros Warner Losh
` (31 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Kyle Evans,
Karim Taha, Richard Henderson
From: Kyle Evans <kevans@FreeBSD.org>
Implement PRAGMA_DISABLE_PACKED_WARNING and
PRAGMA_REENABLE_PACKED_WARNING macros in include/qemu/compiler.h.
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
include/qemu/compiler.h | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h
index a309f90c768..b0374425180 100644
--- a/include/qemu/compiler.h
+++ b/include/qemu/compiler.h
@@ -22,6 +22,36 @@
#define QEMU_EXTERN_C extern
#endif
+/*
+ * Tricky points:
+ * - Use __builtin_choose_expr to avoid type promotion from ?:,
+ * - Invalid sizes result in a compile time error stemming from
+ * the fact that abort has no parameters.
+ * - It's easier to use the endian-specific unaligned load/store
+ * functions than host-endian unaligned load/store plus tswapN.
+ * - The pragmas are necessary only to silence a clang false-positive
+ * warning: see https://bugs.llvm.org/show_bug.cgi?id=39113 .
+ * - We have to disable -Wpragmas warnings to avoid a complaint about
+ * an unknown warning type from older compilers that don't know about
+ * -Waddress-of-packed-member.
+ * - gcc has bugs in its _Pragma() support in some versions, eg
+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 -- so we only
+ * include the warning-suppression pragmas for clang
+ */
+#ifdef __clang__
+#define PRAGMA_DISABLE_PACKED_WARNING \
+ _Pragma("GCC diagnostic push"); \
+ _Pragma("GCC diagnostic ignored \"-Wpragmas\""); \
+ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"")
+
+#define PRAGMA_REENABLE_PACKED_WARNING \
+ _Pragma("GCC diagnostic pop")
+
+#else
+#define PRAGMA_DISABLE_PACKED_WARNING
+#define PRAGMA_REENABLE_PACKED_WARNING
+#endif
+
#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))
# define QEMU_PACKED __attribute__((gcc_struct, packed))
#else
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 06/36] bsd-user; Update the definitions of __put_user and __get_user macros
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (4 preceding siblings ...)
2023-08-28 23:37 ` [PULL 05/36] bsd-user: Disable clang warnings Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 07/36] bsd-user: Declarations of h2t and t2h conversion functions Warner Losh
` (30 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
Use __builtin_choose_expr to avoid type promotion from ?:
in __put_user_e and __get_user_e macros.
Copied from linux-user/qemu.h, originally by Blue Swirl.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/qemu.h | 81 ++++++++++++++++++++---------------------------
bsd-user/signal.c | 5 +--
2 files changed, 35 insertions(+), 51 deletions(-)
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 61501c321b0..ca791e18b22 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -272,50 +272,37 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
* These are usually used to access struct data members once the struct has been
* locked - usually with lock_user_struct().
*/
-#define __put_user(x, hptr)\
-({\
- int size = sizeof(*hptr);\
- switch (size) {\
- case 1:\
- *(uint8_t *)(hptr) = (uint8_t)(typeof(*hptr))(x);\
- break;\
- case 2:\
- *(uint16_t *)(hptr) = tswap16((typeof(*hptr))(x));\
- break;\
- case 4:\
- *(uint32_t *)(hptr) = tswap32((typeof(*hptr))(x));\
- break;\
- case 8:\
- *(uint64_t *)(hptr) = tswap64((typeof(*hptr))(x));\
- break;\
- default:\
- abort();\
- } \
- 0;\
-})
+#define __put_user_e(x, hptr, e) \
+ do { \
+ PRAGMA_DISABLE_PACKED_WARNING; \
+ (__builtin_choose_expr(sizeof(*(hptr)) == 1, stb_p, \
+ __builtin_choose_expr(sizeof(*(hptr)) == 2, stw_##e##_p, \
+ __builtin_choose_expr(sizeof(*(hptr)) == 4, stl_##e##_p, \
+ __builtin_choose_expr(sizeof(*(hptr)) == 8, stq_##e##_p, abort)))) \
+ ((hptr), (x)), (void)0); \
+ PRAGMA_REENABLE_PACKED_WARNING; \
+ } while (0)
+
+#define __get_user_e(x, hptr, e) \
+ do { \
+ PRAGMA_DISABLE_PACKED_WARNING; \
+ ((x) = (typeof(*hptr))( \
+ __builtin_choose_expr(sizeof(*(hptr)) == 1, ldub_p, \
+ __builtin_choose_expr(sizeof(*(hptr)) == 2, lduw_##e##_p, \
+ __builtin_choose_expr(sizeof(*(hptr)) == 4, ldl_##e##_p, \
+ __builtin_choose_expr(sizeof(*(hptr)) == 8, ldq_##e##_p, abort)))) \
+ (hptr)), (void)0); \
+ PRAGMA_REENABLE_PACKED_WARNING; \
+ } while (0)
-#define __get_user(x, hptr) \
-({\
- int size = sizeof(*hptr);\
- switch (size) {\
- case 1:\
- x = (typeof(*hptr))*(uint8_t *)(hptr);\
- break;\
- case 2:\
- x = (typeof(*hptr))tswap16(*(uint16_t *)(hptr));\
- break;\
- case 4:\
- x = (typeof(*hptr))tswap32(*(uint32_t *)(hptr));\
- break;\
- case 8:\
- x = (typeof(*hptr))tswap64(*(uint64_t *)(hptr));\
- break;\
- default:\
- x = 0;\
- abort();\
- } \
- 0;\
-})
+
+#if TARGET_BIG_ENDIAN
+# define __put_user(x, hptr) __put_user_e(x, hptr, be)
+# define __get_user(x, hptr) __get_user_e(x, hptr, be)
+#else
+# define __put_user(x, hptr) __put_user_e(x, hptr, le)
+# define __get_user(x, hptr) __get_user_e(x, hptr, le)
+#endif
/*
* put_user()/get_user() take a guest address and check access
@@ -328,10 +315,10 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
({ \
abi_ulong __gaddr = (gaddr); \
target_type *__hptr; \
- abi_long __ret; \
+ abi_long __ret = 0; \
__hptr = lock_user(VERIFY_WRITE, __gaddr, sizeof(target_type), 0); \
if (__hptr) { \
- __ret = __put_user((x), __hptr); \
+ __put_user((x), __hptr); \
unlock_user(__hptr, __gaddr, sizeof(target_type)); \
} else \
__ret = -TARGET_EFAULT; \
@@ -342,10 +329,10 @@ static inline bool access_ok(int type, abi_ulong addr, abi_ulong size)
({ \
abi_ulong __gaddr = (gaddr); \
target_type *__hptr; \
- abi_long __ret; \
+ abi_long __ret = 0; \
__hptr = lock_user(VERIFY_READ, __gaddr, sizeof(target_type), 1); \
if (__hptr) { \
- __ret = __get_user((x), __hptr); \
+ __get_user((x), __hptr); \
unlock_user(__hptr, __gaddr, 0); \
} else { \
(x) = 0; \
diff --git a/bsd-user/signal.c b/bsd-user/signal.c
index f4e078ee1da..4db85a3485e 100644
--- a/bsd-user/signal.c
+++ b/bsd-user/signal.c
@@ -787,10 +787,7 @@ static int reset_signal_mask(target_ucontext_t *ucontext)
TaskState *ts = (TaskState *)thread_cpu->opaque;
for (i = 0; i < TARGET_NSIG_WORDS; i++) {
- if (__get_user(target_set.__bits[i],
- &ucontext->uc_sigmask.__bits[i])) {
- return -TARGET_EFAULT;
- }
+ __get_user(target_set.__bits[i], &ucontext->uc_sigmask.__bits[i]);
}
target_to_host_sigset_internal(&blocked, &target_set);
ts->signal_mask = blocked;
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 07/36] bsd-user: Declarations of h2t and t2h conversion functions.
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (5 preceding siblings ...)
2023-08-28 23:37 ` [PULL 06/36] bsd-user; Update the definitions of __put_user and __get_user macros Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 08/36] bsd-user: Add struct target_freebsd11_stat to bsd-user/syscall_defs Warner Losh
` (29 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Michal Meloun, Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Declarations of functions that convert between host and target structs.
Co-authored-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/qemu-os.h | 50 ++++++++++++++++++++++++++++++++++++++
bsd-user/qemu.h | 1 +
2 files changed, 51 insertions(+)
create mode 100644 bsd-user/freebsd/qemu-os.h
diff --git a/bsd-user/freebsd/qemu-os.h b/bsd-user/freebsd/qemu-os.h
new file mode 100644
index 00000000000..12adc50928c
--- /dev/null
+++ b/bsd-user/freebsd/qemu-os.h
@@ -0,0 +1,50 @@
+/*
+ * FreeBSD conversion extern declarations
+ *
+ * Copyright (c) 2013 Stacey D. Son
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QEMU_OS_H
+#define QEMU_OS_H
+
+/* qemu/osdep.h pulls in the rest */
+
+#include <sys/acl.h>
+#include <sys/mount.h>
+#include <sys/timex.h>
+#include <sys/rtprio.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+struct freebsd11_stat;
+
+/* os-stat.c */
+abi_long h2t_freebsd11_stat(abi_ulong target_addr,
+ struct freebsd11_stat *host_st);
+abi_long h2t_freebsd11_nstat(abi_ulong target_addr,
+ struct freebsd11_stat *host_st);
+abi_long t2h_freebsd_fhandle(fhandle_t *host_fh, abi_ulong target_addr);
+abi_long h2t_freebsd_fhandle(abi_ulong target_addr, fhandle_t *host_fh);
+abi_long h2t_freebsd11_statfs(abi_ulong target_addr,
+ struct freebsd11_statfs *host_statfs);
+abi_long target_to_host_fcntl_cmd(int cmd);
+abi_long h2t_freebsd_stat(abi_ulong target_addr,
+ struct stat *host_st);
+abi_long h2t_freebsd_statfs(abi_ulong target_addr,
+ struct statfs *host_statfs);
+
+#endif /* QEMU_OS_H */
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index ca791e18b22..4cfd5c63371 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -38,6 +38,7 @@ extern char **environ;
#include "exec/gdbstub.h"
#include "qemu/clang-tsa.h"
+#include "qemu-os.h"
/*
* This struct is used to hold certain information about the image. Basically,
* it replicates in user space what would be certain task_struct fields in the
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 08/36] bsd-user: Add struct target_freebsd11_stat to bsd-user/syscall_defs
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (6 preceding siblings ...)
2023-08-28 23:37 ` [PULL 07/36] bsd-user: Declarations of h2t and t2h conversion functions Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 09/36] bsd-user: Add struct target_stat to bsd-user/syscall_defs.h Warner Losh
` (28 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Singed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/syscall_defs.h | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index aedfbf2d7db..56198cc6a00 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -179,6 +179,39 @@ struct target_freebsd__wrusage {
struct target_freebsd_rusage wru_children;
};
+/*
+ * sys/stat.h
+ */
+struct target_freebsd11_stat {
+ uint32_t st_dev; /* inode's device */
+ uint32_t st_ino; /* inode's number */
+ int16_t st_mode; /* inode protection mode */
+ int16_t st_nlink; /* number of hard links */
+ uint32_t st_uid; /* user ID of the file's owner */
+ uint32_t st_gid; /* group ID of the file's group */
+ uint32_t st_rdev; /* device type */
+ struct target_freebsd_timespec st_atim; /* time last accessed */
+ struct target_freebsd_timespec st_mtim; /* time last data modification */
+ struct target_freebsd_timespec st_ctim; /* time last file status change */
+ int64_t st_size; /* file size, in bytes */
+ int64_t st_blocks; /* blocks allocated for file */
+ uint32_t st_blksize; /* optimal blocksize for I/O */
+ uint32_t st_flags; /* user defined flags for file */
+ uint32_t st_gen; /* file generation number */
+ int32_t st_lspare;
+ struct target_freebsd_timespec st_birthtim; /* time of file creation */
+ /*
+ * Explicitly pad st_birthtim to 16 bytes so that the size of
+ * struct stat is backwards compatible. We use bitfields instead
+ * of an array of chars so that this doesn't require a C99 compiler
+ * to compile if the size of the padding is 0. We use 2 bitfields
+ * to cover up to 64 bits on 32-bit machines. We assume that
+ * CHAR_BIT is 8...
+ */
+ unsigned int:(8 / 2) * (16 - (int)sizeof(struct target_freebsd_timespec));
+ unsigned int:(8 / 2) * (16 - (int)sizeof(struct target_freebsd_timespec));
+} __packed;
+
#define safe_syscall0(type, name) \
type safe_##name(void) \
{ \
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 09/36] bsd-user: Add struct target_stat to bsd-user/syscall_defs.h
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (7 preceding siblings ...)
2023-08-28 23:37 ` [PULL 08/36] bsd-user: Add struct target_freebsd11_stat to bsd-user/syscall_defs Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 10/36] bsd-user: Add structs target_freebsd11_{nstat,statfs} Warner Losh
` (27 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/syscall_defs.h | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index 56198cc6a00..bd04b30a560 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -212,6 +212,44 @@ struct target_freebsd11_stat {
unsigned int:(8 / 2) * (16 - (int)sizeof(struct target_freebsd_timespec));
} __packed;
+#if defined(__i386__)
+#define TARGET_HAS_STAT_TIME_T_EXT 1
+#endif
+
+struct target_stat {
+ uint64_t st_dev; /* inode's device */
+ uint64_t st_ino; /* inode's number */
+ uint64_t st_nlink; /* number of hard links */
+ int16_t st_mode; /* inode protection mode */
+ int16_t st_padding0;
+ uint32_t st_uid; /* user ID of the file's owner */
+ uint32_t st_gid; /* group ID of the file's group */
+ int32_t st_padding1;
+ uint64_t st_rdev; /* device type */
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+ int32_t st_atim_ext;
+#endif
+ struct target_freebsd_timespec st_atim; /* time of last access */
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+ int32_t st_mtim_ext;
+#endif
+ struct target_freebsd_timespec st_mtim; /* time of last data modification */
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+ int32_t st_ctim_ext;
+#endif
+ struct target_freebsd_timespec st_ctim;/* time of last file status change */
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+ int32_t st_btim_ext;
+#endif
+ struct target_freebsd_timespec st_birthtim; /* time of file creation */
+ int64_t st_size; /* file size, in bytes */
+ int64_t st_blocks; /* blocks allocated for file */
+ uint32_t st_blksize; /* optimal blocksize for I/O */
+ uint32_t st_flags; /* user defined flags for file */
+ uint64_t st_gen; /* file generation number */
+ uint64_t st_spare[10];
+};
+
#define safe_syscall0(type, name) \
type safe_##name(void) \
{ \
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 10/36] bsd-user: Add structs target_freebsd11_{nstat,statfs}
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (8 preceding siblings ...)
2023-08-28 23:37 ` [PULL 09/36] bsd-user: Add struct target_stat to bsd-user/syscall_defs.h Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 11/36] bsd-user: Add struct target_statfs Warner Losh
` (26 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Add structs target_freebsd11_nstat and target_freebsd11_statfs to
bsd-user/syscall_defs.h
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/syscall_defs.h | 64 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index bd04b30a560..51d8ff0dd8e 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -250,6 +250,70 @@ struct target_stat {
uint64_t st_spare[10];
};
+
+/* struct nstat is the same as stat above but without the st_lspare field */
+struct target_freebsd11_nstat {
+ uint32_t st_dev; /* inode's device */
+ uint32_t st_ino; /* inode's number */
+ int16_t st_mode; /* inode protection mode */
+ int16_t st_nlink; /* number of hard links */
+ uint32_t st_uid; /* user ID of the file's owner */
+ uint32_t st_gid; /* group ID of the file's group */
+ uint32_t st_rdev; /* device type */
+ struct target_freebsd_timespec st_atim; /* time last accessed */
+ struct target_freebsd_timespec st_mtim; /* time last data modification */
+ struct target_freebsd_timespec st_ctim; /* time last file status change */
+ int64_t st_size; /* file size, in bytes */
+ int64_t st_blocks; /* blocks allocated for file */
+ uint32_t st_blksize; /* optimal blocksize for I/O */
+ uint32_t st_flags; /* user defined flags for file */
+ uint32_t st_gen; /* file generation number */
+ struct target_freebsd_timespec st_birthtim; /* time of file creation */
+ /*
+ * Explicitly pad st_birthtim to 16 bytes so that the size of
+ * struct stat is backwards compatible. We use bitfields instead
+ * of an array of chars so that this doesn't require a C99 compiler
+ * to compile if the size of the padding is 0. We use 2 bitfields
+ * to cover up to 64 bits on 32-bit machines. We assume that
+ * CHAR_BIT is 8...
+ */
+ unsigned int:(8 / 2) * (16 - (int)sizeof(struct target_freebsd_timespec));
+ unsigned int:(8 / 2) * (16 - (int)sizeof(struct target_freebsd_timespec));
+} __packed;
+
+/*
+ * sys/mount.h
+ */
+
+/* filesystem id type */
+typedef struct target_freebsd_fsid { int32_t val[2]; } target_freebsd_fsid_t;
+
+/* filesystem statistics */
+struct target_freebsd11_statfs {
+ uint32_t f_version; /* structure version number */
+ uint32_t f_type; /* type of filesystem */
+ uint64_t f_flags; /* copy of mount exported flags */
+ uint64_t f_bsize; /* filesystem fragment size */
+ uint64_t f_iosize; /* optimal transfer block size */
+ uint64_t f_blocks; /* total data blocks in filesystem */
+ uint64_t f_bfree; /* free blocks in filesystem */
+ int64_t f_bavail; /* free blocks avail to non-superuser */
+ uint64_t f_files; /* total file nodes in filesystem */
+ int64_t f_ffree; /* free nodes avail to non-superuser */
+ uint64_t f_syncwrites; /* count of sync writes since mount */
+ uint64_t f_asyncwrites; /* count of async writes since mount */
+ uint64_t f_syncreads; /* count of sync reads since mount */
+ uint64_t f_asyncreads; /* count of async reads since mount */
+ uint64_t f_spare[10]; /* unused spare */
+ uint32_t f_namemax; /* maximum filename length */
+ uint32_t f_owner; /* user that mounted the filesystem */
+ target_freebsd_fsid_t f_fsid; /* filesystem id */
+ char f_charspare[80]; /* spare string space */
+ char f_fstypename[16]; /* filesys type name */
+ char f_mntfromname[88]; /* mount filesystem */
+ char f_mntonname[88]; /* dir on which mounted*/
+};
+
#define safe_syscall0(type, name) \
type safe_##name(void) \
{ \
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 11/36] bsd-user: Add struct target_statfs
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (9 preceding siblings ...)
2023-08-28 23:37 ` [PULL 10/36] bsd-user: Add structs target_freebsd11_{nstat,statfs} Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 12/36] bsd-user: Add struct target_freebsd_fhandle and fcntl flags Warner Losh
` (25 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Add struct target_statfs to bsd-user/syscall_defs.h
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/syscall_defs.h | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index 51d8ff0dd8e..499a80f8bff 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -314,6 +314,31 @@ struct target_freebsd11_statfs {
char f_mntonname[88]; /* dir on which mounted*/
};
+struct target_statfs {
+ uint32_t f_version; /* structure version number */
+ uint32_t f_type; /* type of filesystem */
+ uint64_t f_flags; /* copy of mount exported flags */
+ uint64_t f_bsize; /* filesystem fragment size */
+ uint64_t f_iosize; /* optimal transfer block size */
+ uint64_t f_blocks; /* total data blocks in filesystem */
+ uint64_t f_bfree; /* free blocks in filesystem */
+ int64_t f_bavail; /* free blocks avail to non-superuser */
+ uint64_t f_files; /* total file nodes in filesystem */
+ int64_t f_ffree; /* free nodes avail to non-superuser */
+ uint64_t f_syncwrites; /* count of sync writes since mount */
+ uint64_t f_asyncwrites; /* count of async writes since mount */
+ uint64_t f_syncreads; /* count of sync reads since mount */
+ uint64_t f_asyncreads; /* count of async reads since mount */
+ uint64_t f_spare[10]; /* unused spare */
+ uint32_t f_namemax; /* maximum filename length */
+ uint32_t f_owner; /* user that mounted the filesystem */
+ target_freebsd_fsid_t f_fsid; /* filesystem id */
+ char f_charspare[80]; /* spare string space */
+ char f_fstypename[16]; /* filesystem type name */
+ char f_mntfromname[1024]; /* mounted filesystem */
+ char f_mntonname[1024]; /* directory on which mounted */
+};
+
#define safe_syscall0(type, name) \
type safe_##name(void) \
{ \
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 12/36] bsd-user: Add struct target_freebsd_fhandle and fcntl flags
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (10 preceding siblings ...)
2023-08-28 23:37 ` [PULL 11/36] bsd-user: Add struct target_statfs Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 13/36] bsd-user: Define safe_fcntl macro in bsd-user/syscall_defs.h Warner Losh
` (24 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Add struct target_freebsd_fhandle and fcntl flags to
bsd-user/syscall_defs.h
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/syscall_defs.h | 51 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index 499a80f8bff..96ae90b0631 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -339,6 +339,57 @@ struct target_statfs {
char f_mntonname[1024]; /* directory on which mounted */
};
+/* File identifier. These are unique per filesystem on a single machine. */
+#define TARGET_MAXFIDSZ 16
+
+struct target_freebsd_fid {
+ uint16_t fid_len; /* len of data in bytes */
+ uint16_t fid_data0; /* force longword align */
+ char fid_data[TARGET_MAXFIDSZ]; /* data (variable len) */
+};
+
+/* Generic file handle */
+struct target_freebsd_fhandle {
+ target_freebsd_fsid_t fh_fsid; /* Filesystem id of mount point */
+ struct target_freebsd_fid fh_fid; /* Filesys specific id */
+};
+typedef struct target_freebsd_fhandle target_freebsd_fhandle_t;
+
+/*
+ * sys/fcntl.h
+ */
+#define TARGET_F_DUPFD 0
+#define TARGET_F_GETFD 1
+#define TARGET_F_SETFD 2
+#define TARGET_F_GETFL 3
+#define TARGET_F_SETFL 4
+#define TARGET_F_GETOWN 5
+#define TARGET_F_SETOWN 6
+#define TARGET_F_OGETLK 7
+#define TARGET_F_OSETLK 8
+#define TARGET_F_OSETLKW 9
+#define TARGET_F_DUP2FD 10
+#define TARGET_F_GETLK 11
+#define TARGET_F_SETLK 12
+#define TARGET_F_SETLKW 13
+#define TARGET_F_SETLK_REMOTE 14
+#define TARGET_F_READAHEAD 15
+#define TARGET_F_RDAHEAD 16
+#define TARGET_F_DUPFD_CLOEXEC 17
+#define TARGET_F_DUP2FD_CLOEXEC 18
+/* FreeBSD-specific */
+#define TARGET_F_ADD_SEALS 19
+#define TARGET_F_GET_SEALS 20
+
+struct target_freebsd_flock {
+ int64_t l_start;
+ int64_t l_len;
+ int32_t l_pid;
+ int16_t l_type;
+ int16_t l_whence;
+ int32_t l_sysid;
+} QEMU_PACKED;
+
#define safe_syscall0(type, name) \
type safe_##name(void) \
{ \
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 13/36] bsd-user: Define safe_fcntl macro in bsd-user/syscall_defs.h
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (11 preceding siblings ...)
2023-08-28 23:37 ` [PULL 12/36] bsd-user: Add struct target_freebsd_fhandle and fcntl flags Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:37 ` [PULL 14/36] bsd-user: Rename target_freebsd_time_t to target_time_t Warner Losh
` (23 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Kyle Evans,
Karim Taha, Richard Henderson
From: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Kyle Evans <kevans@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/syscall_defs.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index 96ae90b0631..c6699c9943e 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -437,6 +437,8 @@ type safe_##name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, \
return safe_syscall(SYS_##name, arg1, arg2, arg3, arg4, arg5, arg6); \
}
+#define safe_fcntl(...) safe_syscall(SYS_fcntl, __VA_ARGS__)
+
/* So far all target and host bitmasks are the same */
#undef target_to_host_bitmask
#define target_to_host_bitmask(x, tbl) (x)
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 14/36] bsd-user: Rename target_freebsd_time_t to target_time_t
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (12 preceding siblings ...)
2023-08-28 23:37 ` [PULL 13/36] bsd-user: Define safe_fcntl macro in bsd-user/syscall_defs.h Warner Losh
@ 2023-08-28 23:37 ` Warner Losh
2023-08-28 23:38 ` [PULL 15/36] bsd-user: Implement h2t_freebsd11_stat h2t_freebsd_nstat Warner Losh
` (22 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:37 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
This is necessary for future code using target_time_t, in
bsd-user/syscall_defs.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/syscall_defs.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index c6699c9943e..9c90616baae 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -45,9 +45,9 @@
*
*/
#if (!defined(TARGET_I386))
-typedef int64_t target_freebsd_time_t;
+typedef int64_t target_time_t;
#else
-typedef int32_t target_freebsd_time_t;
+typedef int32_t target_time_t;
#endif
struct target_iovec {
@@ -102,7 +102,7 @@ typedef abi_long target_freebsd_suseconds_t;
/* compare to sys/timespec.h */
struct target_freebsd_timespec {
- target_freebsd_time_t tv_sec; /* seconds */
+ target_time_t tv_sec; /* seconds */
abi_long tv_nsec; /* and nanoseconds */
#if !defined(TARGET_I386) && TARGET_ABI_BITS == 32
abi_long _pad;
@@ -120,7 +120,7 @@ struct target_freebsd__umtx_time {
};
struct target_freebsd_timeval {
- target_freebsd_time_t tv_sec; /* seconds */
+ target_time_t tv_sec; /* seconds */
target_freebsd_suseconds_t tv_usec;/* and microseconds */
#if !defined(TARGET_I386) && TARGET_ABI_BITS == 32
abi_long _pad;
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 15/36] bsd-user: Implement h2t_freebsd11_stat h2t_freebsd_nstat
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (13 preceding siblings ...)
2023-08-28 23:37 ` [PULL 14/36] bsd-user: Rename target_freebsd_time_t to target_time_t Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 16/36] bsd-user: Implement h2t_freebsd_fhandle t2h_freebsd_fhandle Warner Losh
` (21 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the stat conversion functions:
h2t_freebsd11_stat
h2t_freebsd_nstat
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.c | 94 ++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
create mode 100644 bsd-user/freebsd/os-stat.c
diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
new file mode 100644
index 00000000000..8c73f7402c2
--- /dev/null
+++ b/bsd-user/freebsd/os-stat.c
@@ -0,0 +1,94 @@
+/*
+ * FreeBSD stat related conversion routines
+ *
+ * Copyright (c) 2013 Stacey D. Son
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+#include "qemu/osdep.h"
+
+#include "qemu.h"
+
+/*
+ * stat conversion
+ */
+abi_long h2t_freebsd11_stat(abi_ulong target_addr,
+ struct freebsd11_stat *host_st)
+{
+ struct target_freebsd11_stat *target_st;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ memset(target_st, 0, sizeof(*target_st));
+ __put_user(host_st->st_dev, &target_st->st_dev);
+ __put_user(host_st->st_ino, &target_st->st_ino);
+ __put_user(host_st->st_mode, &target_st->st_mode);
+ __put_user(host_st->st_nlink, &target_st->st_nlink);
+ __put_user(host_st->st_uid, &target_st->st_uid);
+ __put_user(host_st->st_gid, &target_st->st_gid);
+ __put_user(host_st->st_rdev, &target_st->st_rdev);
+ __put_user(host_st->st_atim.tv_sec, &target_st->st_atim.tv_sec);
+ __put_user(host_st->st_atim.tv_nsec, &target_st->st_atim.tv_nsec);
+ __put_user(host_st->st_mtim.tv_sec, &target_st->st_mtim.tv_sec);
+ __put_user(host_st->st_mtim.tv_nsec, &target_st->st_mtim.tv_nsec);
+ __put_user(host_st->st_ctim.tv_sec, &target_st->st_ctim.tv_sec);
+ __put_user(host_st->st_ctim.tv_nsec, &target_st->st_ctim.tv_nsec);
+ __put_user(host_st->st_size, &target_st->st_size);
+ __put_user(host_st->st_blocks, &target_st->st_blocks);
+ __put_user(host_st->st_blksize, &target_st->st_blksize);
+ __put_user(host_st->st_flags, &target_st->st_flags);
+ __put_user(host_st->st_gen, &target_st->st_gen);
+ /* st_lspare not used */
+ __put_user(host_st->st_birthtim.tv_sec, &target_st->st_birthtim.tv_sec);
+ __put_user(host_st->st_birthtim.tv_nsec, &target_st->st_birthtim.tv_nsec);
+ unlock_user_struct(target_st, target_addr, 1);
+
+ return 0;
+}
+
+abi_long h2t_freebsd11_nstat(abi_ulong target_addr,
+ struct freebsd11_stat *host_st)
+{
+ struct target_freebsd11_nstat *target_st;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ memset(target_st, 0, sizeof(*target_st));
+ __put_user(host_st->st_dev, &target_st->st_dev);
+ __put_user(host_st->st_ino, &target_st->st_ino);
+ __put_user(host_st->st_mode, &target_st->st_mode);
+ __put_user(host_st->st_nlink, &target_st->st_nlink);
+ __put_user(host_st->st_uid, &target_st->st_uid);
+ __put_user(host_st->st_gid, &target_st->st_gid);
+ __put_user(host_st->st_rdev, &target_st->st_rdev);
+ __put_user(host_st->st_atim.tv_sec, &target_st->st_atim.tv_sec);
+ __put_user(host_st->st_atim.tv_nsec, &target_st->st_atim.tv_nsec);
+ __put_user(host_st->st_mtim.tv_sec, &target_st->st_mtim.tv_sec);
+ __put_user(host_st->st_mtim.tv_nsec, &target_st->st_mtim.tv_nsec);
+ __put_user(host_st->st_ctim.tv_sec, &target_st->st_ctim.tv_sec);
+ __put_user(host_st->st_ctim.tv_nsec, &target_st->st_ctim.tv_nsec);
+ __put_user(host_st->st_size, &target_st->st_size);
+ __put_user(host_st->st_blocks, &target_st->st_blocks);
+ __put_user(host_st->st_blksize, &target_st->st_blksize);
+ __put_user(host_st->st_flags, &target_st->st_flags);
+ __put_user(host_st->st_gen, &target_st->st_gen);
+ __put_user(host_st->st_birthtim.tv_sec, &target_st->st_birthtim.tv_sec);
+ __put_user(host_st->st_birthtim.tv_nsec, &target_st->st_birthtim.tv_nsec);
+ unlock_user_struct(target_st, target_addr, 1);
+
+ return 0;
+}
+
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 16/36] bsd-user: Implement h2t_freebsd_fhandle t2h_freebsd_fhandle
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (14 preceding siblings ...)
2023-08-28 23:38 ` [PULL 15/36] bsd-user: Implement h2t_freebsd11_stat h2t_freebsd_nstat Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 17/36] bsd-user: Implement h2t_freebds11_statfs Warner Losh
` (20 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the stat conversion functions:
h2t_freebsd_fhandle
t2h_freebsd_fhandle
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
index 8c73f7402c2..6716cee3e22 100644
--- a/bsd-user/freebsd/os-stat.c
+++ b/bsd-user/freebsd/os-stat.c
@@ -92,3 +92,40 @@ abi_long h2t_freebsd11_nstat(abi_ulong target_addr,
return 0;
}
+/*
+ * file handle conversion
+ */
+abi_long t2h_freebsd_fhandle(fhandle_t *host_fh, abi_ulong target_addr)
+{
+ target_freebsd_fhandle_t *target_fh;
+
+ if (!lock_user_struct(VERIFY_READ, target_fh, target_addr, 1)) {
+ return -TARGET_EFAULT;
+ }
+ __get_user(host_fh->fh_fsid.val[0], &target_fh->fh_fsid.val[0]);
+ __get_user(host_fh->fh_fsid.val[1], &target_fh->fh_fsid.val[0]);
+ __get_user(host_fh->fh_fid.fid_len, &target_fh->fh_fid.fid_len);
+ /* u_short fid_data0; */
+ memcpy(host_fh->fh_fid.fid_data, target_fh->fh_fid.fid_data,
+ TARGET_MAXFIDSZ);
+ unlock_user_struct(target_fh, target_addr, 0);
+ return 0;
+}
+
+abi_long h2t_freebsd_fhandle(abi_ulong target_addr, fhandle_t *host_fh)
+{
+ target_freebsd_fhandle_t *target_fh;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_fh, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ __put_user(host_fh->fh_fsid.val[0], &target_fh->fh_fsid.val[0]);
+ __put_user(host_fh->fh_fsid.val[1], &target_fh->fh_fsid.val[0]);
+ __put_user(host_fh->fh_fid.fid_len, &target_fh->fh_fid.fid_len);
+ /* u_short fid_data0; */
+ memcpy(target_fh->fh_fid.fid_data, host_fh->fh_fid.fid_data,
+ TARGET_MAXFIDSZ);
+ unlock_user_struct(target_fh, target_addr, 1);
+ return 0;
+}
+
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 17/36] bsd-user: Implement h2t_freebds11_statfs
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (15 preceding siblings ...)
2023-08-28 23:38 ` [PULL 16/36] bsd-user: Implement h2t_freebsd_fhandle t2h_freebsd_fhandle Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 18/36] bsd-user: Implement target_to_host_fcntl_cmd Warner Losh
` (19 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the stat conversion functions:
h2t_freebds11_statfs
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.c | 41 ++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
index 6716cee3e22..9eb01bf6645 100644
--- a/bsd-user/freebsd/os-stat.c
+++ b/bsd-user/freebsd/os-stat.c
@@ -129,3 +129,44 @@ abi_long h2t_freebsd_fhandle(abi_ulong target_addr, fhandle_t *host_fh)
return 0;
}
+/*
+ * file system stat
+ */
+abi_long h2t_freebsd11_statfs(abi_ulong target_addr,
+ struct freebsd11_statfs *host_statfs)
+{
+ struct target_freebsd11_statfs *target_statfs;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_statfs, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ __put_user(host_statfs->f_version, &target_statfs->f_version);
+ __put_user(host_statfs->f_type, &target_statfs->f_type);
+ __put_user(host_statfs->f_flags, &target_statfs->f_flags);
+ __put_user(host_statfs->f_bsize, &target_statfs->f_bsize);
+ __put_user(host_statfs->f_iosize, &target_statfs->f_iosize);
+ __put_user(host_statfs->f_blocks, &target_statfs->f_blocks);
+ __put_user(host_statfs->f_bfree, &target_statfs->f_bfree);
+ __put_user(host_statfs->f_bavail, &target_statfs->f_bavail);
+ __put_user(host_statfs->f_files, &target_statfs->f_files);
+ __put_user(host_statfs->f_ffree, &target_statfs->f_ffree);
+ __put_user(host_statfs->f_syncwrites, &target_statfs->f_syncwrites);
+ __put_user(host_statfs->f_asyncwrites, &target_statfs->f_asyncwrites);
+ __put_user(host_statfs->f_syncreads, &target_statfs->f_syncreads);
+ __put_user(host_statfs->f_asyncreads, &target_statfs->f_asyncreads);
+ /* uint64_t f_spare[10]; */
+ __put_user(host_statfs->f_namemax, &target_statfs->f_namemax);
+ __put_user(host_statfs->f_owner, &target_statfs->f_owner);
+ __put_user(host_statfs->f_fsid.val[0], &target_statfs->f_fsid.val[0]);
+ __put_user(host_statfs->f_fsid.val[1], &target_statfs->f_fsid.val[1]);
+ /* char f_charspace[80]; */
+ strncpy(target_statfs->f_fstypename, host_statfs->f_fstypename,
+ sizeof(target_statfs->f_fstypename));
+ strncpy(target_statfs->f_mntfromname, host_statfs->f_mntfromname,
+ sizeof(target_statfs->f_mntfromname));
+ strncpy(target_statfs->f_mntonname, host_statfs->f_mntonname,
+ sizeof(target_statfs->f_mntonname));
+ unlock_user_struct(target_statfs, target_addr, 1);
+ return 0;
+}
+
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 18/36] bsd-user: Implement target_to_host_fcntl_cmd
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (16 preceding siblings ...)
2023-08-28 23:38 ` [PULL 17/36] bsd-user: Implement h2t_freebds11_statfs Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 19/36] bsd-uesr: Implement h2t_freebsd_stat and h2t_freebsd_statfs functions Warner Losh
` (18 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the stat conversion functions:
target_to_host_fcntl_cmd
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
index 9eb01bf6645..2ce235d5dae 100644
--- a/bsd-user/freebsd/os-stat.c
+++ b/bsd-user/freebsd/os-stat.c
@@ -170,3 +170,11 @@ abi_long h2t_freebsd11_statfs(abi_ulong target_addr,
return 0;
}
+/*
+ * fcntl cmd conversion
+ */
+abi_long target_to_host_fcntl_cmd(int cmd)
+{
+ return cmd;
+}
+
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 19/36] bsd-uesr: Implement h2t_freebsd_stat and h2t_freebsd_statfs functions
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (17 preceding siblings ...)
2023-08-28 23:38 ` [PULL 18/36] bsd-user: Implement target_to_host_fcntl_cmd Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 20/36] bsd-user: Implement stat related syscalls Warner Losh
` (17 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
They are the 64-bit variants of h2t_freebsd11_stat and
h2t_freebsd11_statfs, respectively
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.c | 82 ++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.c b/bsd-user/freebsd/os-stat.c
index 2ce235d5dae..f0f9e609c3b 100644
--- a/bsd-user/freebsd/os-stat.c
+++ b/bsd-user/freebsd/os-stat.c
@@ -58,6 +58,50 @@ abi_long h2t_freebsd11_stat(abi_ulong target_addr,
return 0;
}
+abi_long h2t_freebsd_stat(abi_ulong target_addr,
+ struct stat *host_st)
+{
+ struct target_stat *target_st;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_st, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ memset(target_st, 0, sizeof(*target_st));
+ __put_user(host_st->st_dev, &target_st->st_dev);
+ __put_user(host_st->st_ino, &target_st->st_ino);
+ __put_user(host_st->st_nlink, &target_st->st_nlink);
+ __put_user(host_st->st_mode, &target_st->st_mode);
+ __put_user(host_st->st_uid, &target_st->st_uid);
+ __put_user(host_st->st_gid, &target_st->st_gid);
+ __put_user(host_st->st_rdev, &target_st->st_rdev);
+ __put_user(host_st->st_atim.tv_sec, &target_st->st_atim.tv_sec);
+ __put_user(host_st->st_atim.tv_nsec, &target_st->st_atim.tv_nsec);
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+/* __put_user(host_st->st_mtim_ext, &target_st->st_mtim_ext); XXX */
+#endif
+ __put_user(host_st->st_mtim.tv_sec, &target_st->st_mtim.tv_sec);
+ __put_user(host_st->st_mtim.tv_nsec, &target_st->st_mtim.tv_nsec);
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+/* __put_user(host_st->st_ctim_ext, &target_st->st_ctim_ext); XXX */
+#endif
+ __put_user(host_st->st_ctim.tv_sec, &target_st->st_ctim.tv_sec);
+ __put_user(host_st->st_ctim.tv_nsec, &target_st->st_ctim.tv_nsec);
+#ifdef TARGET_HAS_STAT_TIME_T_EXT
+/* __put_user(host_st->st_birthtim_ext, &target_st->st_birthtim_ext); XXX */
+#endif
+ __put_user(host_st->st_birthtim.tv_sec, &target_st->st_birthtim.tv_sec);
+ __put_user(host_st->st_birthtim.tv_nsec, &target_st->st_birthtim.tv_nsec);
+
+ __put_user(host_st->st_size, &target_st->st_size);
+ __put_user(host_st->st_blocks, &target_st->st_blocks);
+ __put_user(host_st->st_blksize, &target_st->st_blksize);
+ __put_user(host_st->st_flags, &target_st->st_flags);
+ __put_user(host_st->st_gen, &target_st->st_gen);
+ unlock_user_struct(target_st, target_addr, 1);
+
+ return 0;
+}
+
abi_long h2t_freebsd11_nstat(abi_ulong target_addr,
struct freebsd11_stat *host_st)
{
@@ -170,6 +214,44 @@ abi_long h2t_freebsd11_statfs(abi_ulong target_addr,
return 0;
}
+abi_long h2t_freebsd_statfs(abi_ulong target_addr,
+ struct statfs *host_statfs)
+{
+ struct target_statfs *target_statfs;
+
+ if (!lock_user_struct(VERIFY_WRITE, target_statfs, target_addr, 0)) {
+ return -TARGET_EFAULT;
+ }
+ __put_user(host_statfs->f_version, &target_statfs->f_version);
+ __put_user(host_statfs->f_type, &target_statfs->f_type);
+ __put_user(host_statfs->f_flags, &target_statfs->f_flags);
+ __put_user(host_statfs->f_bsize, &target_statfs->f_bsize);
+ __put_user(host_statfs->f_iosize, &target_statfs->f_iosize);
+ __put_user(host_statfs->f_blocks, &target_statfs->f_blocks);
+ __put_user(host_statfs->f_bfree, &target_statfs->f_bfree);
+ __put_user(host_statfs->f_bavail, &target_statfs->f_bavail);
+ __put_user(host_statfs->f_files, &target_statfs->f_files);
+ __put_user(host_statfs->f_ffree, &target_statfs->f_ffree);
+ __put_user(host_statfs->f_syncwrites, &target_statfs->f_syncwrites);
+ __put_user(host_statfs->f_asyncwrites, &target_statfs->f_asyncwrites);
+ __put_user(host_statfs->f_syncreads, &target_statfs->f_syncreads);
+ __put_user(host_statfs->f_asyncreads, &target_statfs->f_asyncreads);
+ /* uint64_t f_spare[10]; */
+ __put_user(host_statfs->f_namemax, &target_statfs->f_namemax);
+ __put_user(host_statfs->f_owner, &target_statfs->f_owner);
+ __put_user(host_statfs->f_fsid.val[0], &target_statfs->f_fsid.val[0]);
+ __put_user(host_statfs->f_fsid.val[1], &target_statfs->f_fsid.val[1]);
+ /* char f_charspace[80]; */
+ strncpy(target_statfs->f_fstypename, host_statfs->f_fstypename,
+ sizeof(target_statfs->f_fstypename));
+ strncpy(target_statfs->f_mntfromname, host_statfs->f_mntfromname,
+ sizeof(target_statfs->f_mntfromname));
+ strncpy(target_statfs->f_mntonname, host_statfs->f_mntonname,
+ sizeof(target_statfs->f_mntonname));
+ unlock_user_struct(target_statfs, target_addr, 1);
+ return 0;
+}
+
/*
* fcntl cmd conversion
*/
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 20/36] bsd-user: Implement stat related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (18 preceding siblings ...)
2023-08-28 23:38 ` [PULL 19/36] bsd-uesr: Implement h2t_freebsd_stat and h2t_freebsd_statfs functions Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 21/36] bsd-user: Implement statfh " Warner Losh
` (16 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the following syscalls:
stat(2)
lstat(2)
fstat(2)
fstatat(2)
nstat
nfstat
nlstat
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 130 +++++++++++++++++++++++++++++++++++++
1 file changed, 130 insertions(+)
create mode 100644 bsd-user/freebsd/os-stat.h
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
new file mode 100644
index 00000000000..f8f99b4a723
--- /dev/null
+++ b/bsd-user/freebsd/os-stat.h
@@ -0,0 +1,130 @@
+/*
+ * stat related system call shims and definitions
+ *
+ * Copyright (c) 2013 Stacey D. Son
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef BSD_USER_FREEBSD_OS_STAT_H
+#define BSD_USER_FREEBSD_OS_STAT_H
+
+/* stat(2) */
+static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ struct freebsd11_stat st;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(freebsd11_stat(path(p), &st));
+ UNLOCK_PATH(p, arg1);
+ if (!is_error(ret)) {
+ ret = h2t_freebsd11_stat(arg2, &st);
+ }
+ return ret;
+}
+
+/* lstat(2) */
+static inline abi_long do_freebsd11_lstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ struct freebsd11_stat st;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(freebsd11_lstat(path(p), &st));
+ UNLOCK_PATH(p, arg1);
+ if (!is_error(ret)) {
+ ret = h2t_freebsd11_stat(arg2, &st);
+ }
+ return ret;
+}
+
+/* fstat(2) */
+static inline abi_long do_freebsd_fstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ struct stat st;
+
+ ret = get_errno(fstat(arg1, &st));
+ if (!is_error(ret)) {
+ ret = h2t_freebsd_stat(arg2, &st);
+ }
+ return ret;
+}
+
+/* fstatat(2) */
+static inline abi_long do_freebsd_fstatat(abi_long arg1, abi_long arg2,
+ abi_long arg3, abi_long arg4)
+{
+ abi_long ret;
+ void *p;
+ struct stat st;
+
+ LOCK_PATH(p, arg2);
+ ret = get_errno(fstatat(arg1, p, &st, arg4));
+ UNLOCK_PATH(p, arg2);
+ if (!is_error(ret) && arg3) {
+ ret = h2t_freebsd_stat(arg3, &st);
+ }
+ return ret;
+}
+
+/* undocummented nstat(char *path, struct nstat *ub) syscall */
+static abi_long do_freebsd11_nstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ struct freebsd11_stat st;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(freebsd11_nstat(path(p), &st));
+ UNLOCK_PATH(p, arg1);
+ if (!is_error(ret)) {
+ ret = h2t_freebsd11_nstat(arg2, &st);
+ }
+ return ret;
+}
+
+/* undocummented nfstat(int fd, struct nstat *sb) syscall */
+static abi_long do_freebsd11_nfstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ struct freebsd11_stat st;
+
+ ret = get_errno(freebsd11_nfstat(arg1, &st));
+ if (!is_error(ret)) {
+ ret = h2t_freebsd11_nstat(arg2, &st);
+ }
+ return ret;
+}
+
+/* undocummented nlstat(char *path, struct nstat *ub) syscall */
+static abi_long do_freebsd11_nlstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ struct freebsd11_stat st;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(freebsd11_nlstat(path(p), &st));
+ UNLOCK_PATH(p, arg1);
+ if (!is_error(ret)) {
+ ret = h2t_freebsd11_nstat(arg2, &st);
+ }
+ return ret;
+}
+
+#endif /* BSD_USER_FREEBSD_OS_STAT_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 21/36] bsd-user: Implement statfh related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (19 preceding siblings ...)
2023-08-28 23:38 ` [PULL 20/36] bsd-user: Implement stat related syscalls Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 22/36] bsd-user: Implement statfs " Warner Losh
` (15 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the following syscalls:
getfh(2)
lgetfh(2)
fhopen(2)
fhstat(2)
fhstatfs(2)
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 83 ++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index f8f99b4a723..935663c0713 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -127,4 +127,87 @@ static abi_long do_freebsd11_nlstat(abi_long arg1, abi_long arg2)
return ret;
}
+/* getfh(2) */
+static abi_long do_freebsd_getfh(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ fhandle_t host_fh;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(getfh(path(p), &host_fh));
+ UNLOCK_PATH(p, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+ return h2t_freebsd_fhandle(arg2, &host_fh);
+}
+
+/* lgetfh(2) */
+static inline abi_long do_freebsd_lgetfh(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ fhandle_t host_fh;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(lgetfh(path(p), &host_fh));
+ UNLOCK_PATH(p, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+ return h2t_freebsd_fhandle(arg2, &host_fh);
+}
+
+/* fhopen(2) */
+static inline abi_long do_freebsd_fhopen(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ fhandle_t host_fh;
+
+ ret = t2h_freebsd_fhandle(&host_fh, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ return get_errno(fhopen(&host_fh, arg2));
+}
+
+/* fhstat(2) */
+static inline abi_long do_freebsd_fhstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ fhandle_t host_fh;
+ struct stat host_sb;
+
+ ret = t2h_freebsd_fhandle(&host_fh, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+ ret = get_errno(fhstat(&host_fh, &host_sb));
+ if (is_error(ret)) {
+ return ret;
+ }
+ return h2t_freebsd_stat(arg2, &host_sb);
+}
+
+/* fhstatfs(2) */
+static inline abi_long do_freebsd_fhstatfs(abi_ulong target_fhp_addr,
+ abi_ulong target_stfs_addr)
+{
+ abi_long ret;
+ fhandle_t host_fh;
+ struct statfs host_stfs;
+
+ ret = t2h_freebsd_fhandle(&host_fh, target_fhp_addr);
+ if (is_error(ret)) {
+ return ret;
+ }
+ ret = get_errno(fhstatfs(&host_fh, &host_stfs));
+ if (is_error(ret)) {
+ return ret;
+ }
+ return h2t_freebsd_statfs(target_stfs_addr, &host_stfs);
+}
+
#endif /* BSD_USER_FREEBSD_OS_STAT_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 22/36] bsd-user: Implement statfs related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (20 preceding siblings ...)
2023-08-28 23:38 ` [PULL 21/36] bsd-user: Implement statfh " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 23/36] bsd-user: Implement getdents " Warner Losh
` (14 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the following syscalls:
statfs(2)
fstatfs(2)
getfsstat(2)
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 69 ++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 935663c0713..9492c93c55a 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -210,4 +210,73 @@ static inline abi_long do_freebsd_fhstatfs(abi_ulong target_fhp_addr,
return h2t_freebsd_statfs(target_stfs_addr, &host_stfs);
}
+/* statfs(2) */
+static inline abi_long do_freebsd_statfs(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ struct statfs host_stfs;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(statfs(path(p), &host_stfs));
+ UNLOCK_PATH(p, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ return h2t_freebsd_statfs(arg2, &host_stfs);
+}
+
+/* fstatfs(2) */
+static inline abi_long do_freebsd_fstatfs(abi_long fd, abi_ulong target_addr)
+{
+ abi_long ret;
+ struct statfs host_stfs;
+
+ ret = get_errno(fstatfs(fd, &host_stfs));
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ return h2t_freebsd_statfs(target_addr, &host_stfs);
+}
+
+/* getfsstat(2) */
+static inline abi_long do_freebsd_getfsstat(abi_ulong target_addr,
+ abi_long bufsize, abi_long flags)
+{
+ abi_long ret;
+ struct statfs *host_stfs;
+ int count;
+ long host_bufsize;
+
+ count = bufsize / sizeof(struct target_statfs);
+
+ /* if user buffer is NULL then return number of mounted FS's */
+ if (target_addr == 0 || count == 0) {
+ return get_errno(freebsd11_getfsstat(NULL, 0, flags));
+ }
+
+ /* XXX check count to be reasonable */
+ host_bufsize = sizeof(struct statfs) * count;
+ host_stfs = alloca(host_bufsize);
+ if (!host_stfs) {
+ return -TARGET_EINVAL;
+ }
+
+ ret = count = get_errno(getfsstat(host_stfs, host_bufsize, flags));
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ while (count--) {
+ if (h2t_freebsd_statfs((target_addr +
+ (count * sizeof(struct target_statfs))),
+ &host_stfs[count])) {
+ return -TARGET_EFAULT;
+ }
+ }
+ return ret;
+}
+
#endif /* BSD_USER_FREEBSD_OS_STAT_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 23/36] bsd-user: Implement getdents related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (21 preceding siblings ...)
2023-08-28 23:38 ` [PULL 22/36] bsd-user: Implement statfs " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 24/36] bsd-user: Implement stat " Warner Losh
` (13 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the following syscalls:
getdents(2)
getdirecentries(2)
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 9492c93c55a..7dc41cd0bfe 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -279,4 +279,76 @@ static inline abi_long do_freebsd_getfsstat(abi_ulong target_addr,
return ret;
}
+/* getdents(2) */
+static inline abi_long do_freebsd11_getdents(abi_long arg1,
+ abi_ulong arg2, abi_long nbytes)
+{
+ abi_long ret;
+ struct freebsd11_dirent *dirp;
+
+ dirp = lock_user(VERIFY_WRITE, arg2, nbytes, 0);
+ if (dirp == NULL) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(freebsd11_getdents(arg1, (char *)dirp, nbytes));
+ if (!is_error(ret)) {
+ struct freebsd11_dirent *de;
+ int len = ret;
+ int reclen;
+
+ de = dirp;
+ while (len > 0) {
+ reclen = de->d_reclen;
+ if (reclen > len) {
+ return -TARGET_EFAULT;
+ }
+ de->d_reclen = tswap16(reclen);
+ de->d_fileno = tswap32(de->d_fileno);
+ len -= reclen;
+ }
+ }
+ return ret;
+}
+
+/* getdirecentries(2) */
+static inline abi_long do_freebsd_getdirentries(abi_long arg1,
+ abi_ulong arg2, abi_long nbytes, abi_ulong arg4)
+{
+ abi_long ret;
+ struct dirent *dirp;
+ long basep;
+
+ dirp = lock_user(VERIFY_WRITE, arg2, nbytes, 0);
+ if (dirp == NULL) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(getdirentries(arg1, (char *)dirp, nbytes, &basep));
+ if (!is_error(ret)) {
+ struct dirent *de;
+ int len = ret;
+ int reclen;
+
+ de = dirp;
+ while (len > 0) {
+ reclen = de->d_reclen;
+ if (reclen > len) {
+ return -TARGET_EFAULT;
+ }
+ de->d_fileno = tswap64(de->d_fileno);
+ de->d_off = tswap64(de->d_off);
+ de->d_reclen = tswap16(de->d_reclen);
+ de->d_namlen = tswap16(de->d_namlen);
+ len -= reclen;
+ de = (struct dirent *)((void *)de + reclen);
+ }
+ }
+ unlock_user(dirp, arg2, ret);
+ if (arg4) {
+ if (put_user(basep, arg4, abi_ulong)) {
+ return -TARGET_EFAULT;
+ }
+ }
+ return ret;
+}
+
#endif /* BSD_USER_FREEBSD_OS_STAT_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 24/36] bsd-user: Implement stat related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (22 preceding siblings ...)
2023-08-28 23:38 ` [PULL 23/36] bsd-user: Implement getdents " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 25/36] bsd-user: Implement freebsd11 " Warner Losh
` (12 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Stacey Son,
Karim Taha, Richard Henderson
From: Stacey Son <sson@FreeBSD.org>
Implement the following syscalls:
fcntl(2)
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 74 ++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 7dc41cd0bfe..5d9323c7d1b 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -351,4 +351,78 @@ static inline abi_long do_freebsd_getdirentries(abi_long arg1,
return ret;
}
+/* fcntl(2) */
+static inline abi_long do_freebsd_fcntl(abi_long arg1, abi_long arg2,
+ abi_ulong arg3)
+{
+ abi_long ret;
+ int host_cmd;
+ struct flock fl;
+ struct target_freebsd_flock *target_fl;
+
+ host_cmd = target_to_host_fcntl_cmd(arg2);
+ if (host_cmd < 0) {
+ return host_cmd;
+ }
+ switch (arg2) {
+ case TARGET_F_GETLK:
+ if (!lock_user_struct(VERIFY_READ, target_fl, arg3, 1)) {
+ return -TARGET_EFAULT;
+ }
+ __get_user(fl.l_type, &target_fl->l_type);
+ __get_user(fl.l_whence, &target_fl->l_whence);
+ __get_user(fl.l_start, &target_fl->l_start);
+ __get_user(fl.l_len, &target_fl->l_len);
+ __get_user(fl.l_pid, &target_fl->l_pid);
+ __get_user(fl.l_sysid, &target_fl->l_sysid);
+ unlock_user_struct(target_fl, arg3, 0);
+ ret = get_errno(safe_fcntl(arg1, host_cmd, &fl));
+ if (!is_error(ret)) {
+ if (!lock_user_struct(VERIFY_WRITE, target_fl, arg3, 0)) {
+ return -TARGET_EFAULT;
+ }
+ __put_user(fl.l_type, &target_fl->l_type);
+ __put_user(fl.l_whence, &target_fl->l_whence);
+ __put_user(fl.l_start, &target_fl->l_start);
+ __put_user(fl.l_len, &target_fl->l_len);
+ __put_user(fl.l_pid, &target_fl->l_pid);
+ __put_user(fl.l_sysid, &target_fl->l_sysid);
+ unlock_user_struct(target_fl, arg3, 1);
+ }
+ break;
+
+ case TARGET_F_SETLK:
+ case TARGET_F_SETLKW:
+ if (!lock_user_struct(VERIFY_READ, target_fl, arg3, 1)) {
+ return -TARGET_EFAULT;
+ }
+ __get_user(fl.l_type, &target_fl->l_type);
+ __get_user(fl.l_whence, &target_fl->l_whence);
+ __get_user(fl.l_start, &target_fl->l_start);
+ __get_user(fl.l_len, &target_fl->l_len);
+ __get_user(fl.l_pid, &target_fl->l_pid);
+ __get_user(fl.l_sysid, &target_fl->l_sysid);
+ unlock_user_struct(target_fl, arg3, 0);
+ ret = get_errno(safe_fcntl(arg1, host_cmd, &fl));
+ break;
+
+ case TARGET_F_DUPFD:
+ case TARGET_F_DUP2FD:
+ case TARGET_F_GETOWN:
+ case TARGET_F_SETOWN:
+ case TARGET_F_GETFD:
+ case TARGET_F_SETFD:
+ case TARGET_F_GETFL:
+ case TARGET_F_SETFL:
+ case TARGET_F_READAHEAD:
+ case TARGET_F_RDAHEAD:
+ case TARGET_F_ADD_SEALS:
+ case TARGET_F_GET_SEALS:
+ default:
+ ret = get_errno(safe_fcntl(arg1, host_cmd, arg3));
+ break;
+ }
+ return ret;
+}
+
#endif /* BSD_USER_FREEBSD_OS_STAT_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 25/36] bsd-user: Implement freebsd11 stat related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (23 preceding siblings ...)
2023-08-28 23:38 ` [PULL 24/36] bsd-user: Implement stat " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 26/36] bsd-user: Implement freebsd11 fstat and fhstat " Warner Losh
` (11 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Stacey Son, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Rename the following syscalls to the freebsd11 variant:
do_freebsd_lstat -> do_freebsd11_lstat
do_freebsd_stat -> do_freebsd11_stat
Co-authored-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 5d9323c7d1b..aef55c8bb53 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -20,6 +20,11 @@
#ifndef BSD_USER_FREEBSD_OS_STAT_H
#define BSD_USER_FREEBSD_OS_STAT_H
+int freebsd11_stat(const char *path, struct freebsd11_stat *stat);
+__sym_compat(stat, freebsd11_stat, FBSD_1.0);
+int freebsd11_lstat(const char *path, struct freebsd11_stat *stat);
+__sym_compat(lstat, freebsd11_lstat, FBSD_1.0);
+
/* stat(2) */
static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
{
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 26/36] bsd-user: Implement freebsd11 fstat and fhstat related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (24 preceding siblings ...)
2023-08-28 23:38 ` [PULL 25/36] bsd-user: Implement freebsd11 " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 27/36] bsd-user: Implement freebsd11 statfs " Warner Losh
` (10 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Stacey Son, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Implement the freebsd11 variant of the following syscalls:
fstat(2)
fstatat(2)
fhstat(2)
fhstatfs(2)
Co-authored-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 78 ++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index aef55c8bb53..2e0c7245dfd 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -24,6 +24,17 @@ int freebsd11_stat(const char *path, struct freebsd11_stat *stat);
__sym_compat(stat, freebsd11_stat, FBSD_1.0);
int freebsd11_lstat(const char *path, struct freebsd11_stat *stat);
__sym_compat(lstat, freebsd11_lstat, FBSD_1.0);
+int freebsd11_fstat(int fd, struct freebsd11_stat *stat);
+__sym_compat(fstat, freebsd11_fstat, FBSD_1.0);
+int freebsd11_fstatat(int fd, const char *path, struct freebsd11_stat *stat,
+ int flag);
+__sym_compat(fstatat, freebsd11_fstatat, FBSD_1.1);
+
+int freebsd11_fhstat(const fhandle_t *fhandle, struct freebsd11_stat *stat);
+__sym_compat(fhstat, freebsd11_fhstat, FBSD_1.0);
+int freebsd11_fhstatfs(const fhandle_t *fhandle, struct freebsd11_statfs * buf);
+__sym_compat(fhstatfs, freebsd11_fhstatfs, FBSD_1.0);
+int freebsd11_statfs(const char *path, struct freebsd11_statfs *buf);
/* stat(2) */
static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
@@ -57,6 +68,19 @@ static inline abi_long do_freebsd11_lstat(abi_long arg1, abi_long arg2)
return ret;
}
+/* fstat(2) */
+static inline abi_long do_freebsd11_fstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ struct freebsd11_stat st;
+
+ ret = get_errno(freebsd11_fstat(arg1, &st));
+ if (!is_error(ret)) {
+ ret = h2t_freebsd11_stat(arg2, &st);
+ }
+ return ret;
+}
+
/* fstat(2) */
static inline abi_long do_freebsd_fstat(abi_long arg1, abi_long arg2)
{
@@ -70,6 +94,23 @@ static inline abi_long do_freebsd_fstat(abi_long arg1, abi_long arg2)
return ret;
}
+/* fstatat(2) */
+static inline abi_long do_freebsd11_fstatat(abi_long arg1, abi_long arg2,
+ abi_long arg3, abi_long arg4)
+{
+ abi_long ret;
+ void *p;
+ struct freebsd11_stat st;
+
+ LOCK_PATH(p, arg2);
+ ret = get_errno(freebsd11_fstatat(arg1, p, &st, arg4));
+ UNLOCK_PATH(p, arg2);
+ if (!is_error(ret) && arg3) {
+ ret = h2t_freebsd11_stat(arg3, &st);
+ }
+ return ret;
+}
+
/* fstatat(2) */
static inline abi_long do_freebsd_fstatat(abi_long arg1, abi_long arg2,
abi_long arg3, abi_long arg4)
@@ -178,6 +219,24 @@ static inline abi_long do_freebsd_fhopen(abi_long arg1, abi_long arg2)
return get_errno(fhopen(&host_fh, arg2));
}
+/* fhstat(2) */
+static inline abi_long do_freebsd11_fhstat(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ fhandle_t host_fh;
+ struct freebsd11_stat host_sb;
+
+ ret = t2h_freebsd_fhandle(&host_fh, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+ ret = get_errno(freebsd11_fhstat(&host_fh, &host_sb));
+ if (is_error(ret)) {
+ return ret;
+ }
+ return h2t_freebsd11_stat(arg2, &host_sb);
+}
+
/* fhstat(2) */
static inline abi_long do_freebsd_fhstat(abi_long arg1, abi_long arg2)
{
@@ -196,6 +255,25 @@ static inline abi_long do_freebsd_fhstat(abi_long arg1, abi_long arg2)
return h2t_freebsd_stat(arg2, &host_sb);
}
+/* fhstatfs(2) */
+static inline abi_long do_freebsd11_fhstatfs(abi_ulong target_fhp_addr,
+ abi_ulong target_stfs_addr)
+{
+ abi_long ret;
+ fhandle_t host_fh;
+ struct freebsd11_statfs host_stfs;
+
+ ret = t2h_freebsd_fhandle(&host_fh, target_fhp_addr);
+ if (is_error(ret)) {
+ return ret;
+ }
+ ret = get_errno(freebsd11_fhstatfs(&host_fh, &host_stfs));
+ if (is_error(ret)) {
+ return ret;
+ }
+ return h2t_freebsd11_statfs(target_stfs_addr, &host_stfs);
+}
+
/* fhstatfs(2) */
static inline abi_long do_freebsd_fhstatfs(abi_ulong target_fhp_addr,
abi_ulong target_stfs_addr)
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 27/36] bsd-user: Implement freebsd11 statfs related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (25 preceding siblings ...)
2023-08-28 23:38 ` [PULL 26/36] bsd-user: Implement freebsd11 fstat and fhstat " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 28/36] bsd-user: Implement freebsd11 getdirents " Warner Losh
` (9 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Stacey Son, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Implement the freebsd11 variant of the following syscalls:
statfs(2)
fstatfs(2)
getfsstat(2)
Co-authored-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 75 ++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 2e0c7245dfd..04a61fabd11 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -32,9 +32,15 @@ __sym_compat(fstatat, freebsd11_fstatat, FBSD_1.1);
int freebsd11_fhstat(const fhandle_t *fhandle, struct freebsd11_stat *stat);
__sym_compat(fhstat, freebsd11_fhstat, FBSD_1.0);
+int freebsd11_getfsstat(struct freebsd11_statfs *buf, long bufsize, int mode);
+__sym_compat(getfsstat, freebsd11_getfsstat, FBSD_1.0);
int freebsd11_fhstatfs(const fhandle_t *fhandle, struct freebsd11_statfs * buf);
__sym_compat(fhstatfs, freebsd11_fhstatfs, FBSD_1.0);
int freebsd11_statfs(const char *path, struct freebsd11_statfs *buf);
+__sym_compat(statfs, freebsd11_statfs, FBSD_1.0);
+int freebsd11_fstatfs(int fd, struct freebsd11_statfs *buf);
+__sym_compat(fstatfs, freebsd11_fstatfs, FBSD_1.0);
+
/* stat(2) */
static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
@@ -293,6 +299,23 @@ static inline abi_long do_freebsd_fhstatfs(abi_ulong target_fhp_addr,
return h2t_freebsd_statfs(target_stfs_addr, &host_stfs);
}
+/* statfs(2) */
+static inline abi_long do_freebsd11_statfs(abi_long arg1, abi_long arg2)
+{
+ abi_long ret;
+ void *p;
+ struct freebsd11_statfs host_stfs;
+
+ LOCK_PATH(p, arg1);
+ ret = get_errno(freebsd11_statfs(path(p), &host_stfs));
+ UNLOCK_PATH(p, arg1);
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ return h2t_freebsd11_statfs(arg2, &host_stfs);
+}
+
/* statfs(2) */
static inline abi_long do_freebsd_statfs(abi_long arg1, abi_long arg2)
{
@@ -310,6 +333,20 @@ static inline abi_long do_freebsd_statfs(abi_long arg1, abi_long arg2)
return h2t_freebsd_statfs(arg2, &host_stfs);
}
+/* fstatfs(2) */
+static inline abi_long do_freebsd11_fstatfs(abi_long fd, abi_ulong target_addr)
+{
+ abi_long ret;
+ struct freebsd11_statfs host_stfs;
+
+ ret = get_errno(freebsd11_fstatfs(fd, &host_stfs));
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ return h2t_freebsd11_statfs(target_addr, &host_stfs);
+}
+
/* fstatfs(2) */
static inline abi_long do_freebsd_fstatfs(abi_long fd, abi_ulong target_addr)
{
@@ -324,6 +361,44 @@ static inline abi_long do_freebsd_fstatfs(abi_long fd, abi_ulong target_addr)
return h2t_freebsd_statfs(target_addr, &host_stfs);
}
+/* getfsstat(2) */
+static inline abi_long do_freebsd11_getfsstat(abi_ulong target_addr,
+ abi_long bufsize, abi_long flags)
+{
+ abi_long ret;
+ struct freebsd11_statfs *host_stfs;
+ int count;
+ long host_bufsize;
+
+ count = bufsize / sizeof(struct target_freebsd11_statfs);
+
+ /* if user buffer is NULL then return number of mounted FS's */
+ if (target_addr == 0 || count == 0) {
+ return get_errno(freebsd11_getfsstat(NULL, 0, flags));
+ }
+
+ /* XXX check count to be reasonable */
+ host_bufsize = sizeof(struct freebsd11_statfs) * count;
+ host_stfs = alloca(host_bufsize);
+ if (!host_stfs) {
+ return -TARGET_EINVAL;
+ }
+
+ ret = count = get_errno(freebsd11_getfsstat(host_stfs, host_bufsize, flags));
+ if (is_error(ret)) {
+ return ret;
+ }
+
+ while (count--) {
+ if (h2t_freebsd11_statfs((target_addr +
+ (count * sizeof(struct target_freebsd11_statfs))),
+ &host_stfs[count])) {
+ return -TARGET_EFAULT;
+ }
+ }
+ return ret;
+}
+
/* getfsstat(2) */
static inline abi_long do_freebsd_getfsstat(abi_ulong target_addr,
abi_long bufsize, abi_long flags)
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 28/36] bsd-user: Implement freebsd11 getdirents related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (26 preceding siblings ...)
2023-08-28 23:38 ` [PULL 27/36] bsd-user: Implement freebsd11 statfs " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 29/36] bsd-user: Implement freebsd11 netbsd stat " Warner Losh
` (8 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Stacey Son, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Implement the freebsd11 variant of the following syscalls:
getdirentries(2)
Co-authored-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 44 ++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 04a61fabd11..26909af455d 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -41,6 +41,11 @@ __sym_compat(statfs, freebsd11_statfs, FBSD_1.0);
int freebsd11_fstatfs(int fd, struct freebsd11_statfs *buf);
__sym_compat(fstatfs, freebsd11_fstatfs, FBSD_1.0);
+ssize_t freebsd11_getdirentries(int fd, char *buf, size_t nbytes, off_t *basep);
+__sym_compat(getdirentries, freebsd11_getdirentries, FBSD_1.0);
+ssize_t freebsd11_getdents(int fd, char *buf, size_t nbytes);
+__sym_compat(getdents, freebsd11_getdents, FBSD_1.0);
+
/* stat(2) */
static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
@@ -468,6 +473,45 @@ static inline abi_long do_freebsd11_getdents(abi_long arg1,
return ret;
}
+/* getdirecentries(2) */
+static inline abi_long do_freebsd11_getdirentries(abi_long arg1,
+ abi_ulong arg2, abi_long nbytes, abi_ulong arg4)
+{
+ abi_long ret;
+ struct freebsd11_dirent *dirp;
+ long basep;
+
+ dirp = lock_user(VERIFY_WRITE, arg2, nbytes, 0);
+ if (dirp == NULL) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(freebsd11_getdirentries(arg1, (char *)dirp, nbytes, &basep));
+ if (!is_error(ret)) {
+ struct freebsd11_dirent *de;
+ int len = ret;
+ int reclen;
+
+ de = dirp;
+ while (len > 0) {
+ reclen = de->d_reclen;
+ if (reclen > len) {
+ return -TARGET_EFAULT;
+ }
+ de->d_reclen = tswap16(reclen);
+ de->d_fileno = tswap32(de->d_fileno);
+ len -= reclen;
+ de = (struct freebsd11_dirent *)((void *)de + reclen);
+ }
+ }
+ unlock_user(dirp, arg2, ret);
+ if (arg4) {
+ if (put_user(basep, arg4, abi_ulong)) {
+ return -TARGET_EFAULT;
+ }
+ }
+ return ret;
+}
+
/* getdirecentries(2) */
static inline abi_long do_freebsd_getdirentries(abi_long arg1,
abi_ulong arg2, abi_long nbytes, abi_ulong arg4)
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 29/36] bsd-user: Implement freebsd11 netbsd stat related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (27 preceding siblings ...)
2023-08-28 23:38 ` [PULL 28/36] bsd-user: Implement freebsd11 getdirents " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 30/36] bsd-user: Implement do_freebsd_realpathat syscall Warner Losh
` (7 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Michal Meloun, Stacey Son, Karim Taha, Richard Henderson
From: Michal Meloun <mmel@FreeBSD.org>
Forward declaration of the nstat syscalls:
nstat
nlstat
nfstat
Co-authored-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Stacey Son <sson@FreeBSD.org>
Signed-off-by: Michal Meloun <mmel@FreeBSD.org>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index 26909af455d..e31b2aab9e8 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -46,6 +46,13 @@ __sym_compat(getdirentries, freebsd11_getdirentries, FBSD_1.0);
ssize_t freebsd11_getdents(int fd, char *buf, size_t nbytes);
__sym_compat(getdents, freebsd11_getdents, FBSD_1.0);
+/* undocumented nstat system calls */
+int freebsd11_nstat(const char *path, struct freebsd11_stat *sb);
+__sym_compat(nstat, freebsd11_nstat, FBSD_1.0);
+int freebsd11_nlstat(const char *path, struct freebsd11_stat *sb);
+__sym_compat(nlstat, freebsd11_nlstat, FBSD_1.0);
+int freebsd11_nfstat(int fd, struct freebsd11_stat *sb);
+__sym_compat(nfstat, freebsd11_nfstat, FBSD_1.0);
/* stat(2) */
static inline abi_long do_freebsd11_stat(abi_long arg1, abi_long arg2)
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 30/36] bsd-user: Implement do_freebsd_realpathat syscall
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (28 preceding siblings ...)
2023-08-28 23:38 ` [PULL 29/36] bsd-user: Implement freebsd11 netbsd stat " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 31/36] bsd-user: Add os-stat.c to the build Warner Losh
` (6 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Mikaël Urankar, Karim Taha, Richard Henderson
From: Mikaël Urankar <mikael.urankar@gmail.com>
Signed-off-by: Mikaël Urankar <mikael.urankar@gmail.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-stat.h | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/bsd-user/freebsd/os-stat.h b/bsd-user/freebsd/os-stat.h
index e31b2aab9e8..b20e2707745 100644
--- a/bsd-user/freebsd/os-stat.h
+++ b/bsd-user/freebsd/os-stat.h
@@ -634,4 +634,30 @@ static inline abi_long do_freebsd_fcntl(abi_long arg1, abi_long arg2,
return ret;
}
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1300080
+extern int __realpathat(int fd, const char *path, char *buf, size_t size,
+ int flags);
+/* https://svnweb.freebsd.org/base?view=revision&revision=358172 */
+/* no man page */
+static inline abi_long do_freebsd_realpathat(abi_long arg1, abi_long arg2,
+ abi_long arg3, abi_long arg4, abi_long arg5)
+{
+ abi_long ret;
+ void *p, *b;
+
+ LOCK_PATH(p, arg2);
+ b = lock_user(VERIFY_WRITE, arg3, arg4, 0);
+ if (b == NULL) {
+ UNLOCK_PATH(p, arg2);
+ return -TARGET_EFAULT;
+ }
+
+ ret = get_errno(__realpathat(arg1, p, b, arg4, arg5));
+ UNLOCK_PATH(p, arg2);
+ unlock_user(b, arg3, ret);
+
+ return ret;
+}
+#endif
+
#endif /* BSD_USER_FREEBSD_OS_STAT_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 31/36] bsd-user: Add os-stat.c to the build
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (29 preceding siblings ...)
2023-08-28 23:38 ` [PULL 30/36] bsd-user: Implement do_freebsd_realpathat syscall Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 32/36] bsd-user: Add glue for the freebsd11_stat syscalls Warner Losh
` (5 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
From: Karim Taha <kariem.taha2.7@gmail.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsd-user/freebsd/meson.build b/bsd-user/freebsd/meson.build
index f87c788e846..f2f047cca31 100644
--- a/bsd-user/freebsd/meson.build
+++ b/bsd-user/freebsd/meson.build
@@ -1,4 +1,5 @@
bsd_user_ss.add(files(
+ 'os-stat.c',
'os-sys.c',
'os-syscall.c',
))
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 32/36] bsd-user: Add glue for the freebsd11_stat syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (30 preceding siblings ...)
2023-08-28 23:38 ` [PULL 31/36] bsd-user: Add os-stat.c to the build Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 33/36] bsd-user: Add glue for getfh and related syscalls Warner Losh
` (4 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
Add glue to call the freebsd11_stat syscalls to the freebsd_syscall:
freebsd11_stat
freebsd11_lstat
freebsd11_fstat
freebsd11_fstatat
freebsd11_nstat, freebsd11_nfstat, freebsd11_nlstat
fstatat
fstat
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-syscall.c | 42 +++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 2224a280ea2..ade47a0d2f2 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -36,6 +36,9 @@
#include "bsd-file.h"
#include "bsd-proc.h"
+/* *BSD dependent syscall shims */
+#include "os-stat.h"
+
/* I/O */
safe_syscall3(int, open, const char *, path, int, flags, mode_t, mode);
safe_syscall4(int, openat, int, fd, const char *, path, int, flags, mode_t,
@@ -482,6 +485,45 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_bsd_undelete(arg1);
break;
+ /*
+ * stat system calls
+ */
+ case TARGET_FREEBSD_NR_freebsd11_stat: /* stat(2) */
+ ret = do_freebsd11_stat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_lstat: /* lstat(2) */
+ ret = do_freebsd11_lstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_fstat: /* fstat(2) */
+ ret = do_freebsd11_fstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_fstat: /* fstat(2) */
+ ret = do_freebsd_fstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_fstatat: /* fstatat(2) */
+ ret = do_freebsd11_fstatat(arg1, arg2, arg3, arg4);
+ break;
+
+ case TARGET_FREEBSD_NR_fstatat: /* fstatat(2) */
+ ret = do_freebsd_fstatat(arg1, arg2, arg3, arg4);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_nstat: /* undocumented */
+ ret = do_freebsd11_nstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_nfstat: /* undocumented */
+ ret = do_freebsd11_nfstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_nlstat: /* undocumented */
+ ret = do_freebsd11_nlstat(arg1, arg2);
+ break;
+
/*
* sys{ctl, arch, call}
*/
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 33/36] bsd-user: Add glue for getfh and related syscalls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (31 preceding siblings ...)
2023-08-28 23:38 ` [PULL 32/36] bsd-user: Add glue for the freebsd11_stat syscalls Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 34/36] bsd-user: Add glue for statfs related system calls Warner Losh
` (3 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
Add glue to call the following syscalls to the freebsd_syscall:
getfh
lgetfh
fhopen
freebsd11_fhstat
freebsd11_fhstatfs
fhstat
fhstatfs
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/os-syscall.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index ade47a0d2f2..73616a5be08 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -524,6 +524,34 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_freebsd11_nlstat(arg1, arg2);
break;
+ case TARGET_FREEBSD_NR_getfh: /* getfh(2) */
+ ret = do_freebsd_getfh(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_lgetfh: /* lgetfh(2) */
+ ret = do_freebsd_lgetfh(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_fhopen: /* fhopen(2) */
+ ret = do_freebsd_fhopen(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_fhstat: /* fhstat(2) */
+ ret = do_freebsd11_fhstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_fhstat: /* fhstat(2) */
+ ret = do_freebsd_fhstat(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_fhstatfs: /* fhstatfs(2) */
+ ret = do_freebsd11_fhstatfs(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_fhstatfs: /* fhstatfs(2) */
+ ret = do_freebsd_fhstatfs(arg1, arg2);
+ break;
+
/*
* sys{ctl, arch, call}
*/
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 34/36] bsd-user: Add glue for statfs related system calls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (32 preceding siblings ...)
2023-08-28 23:38 ` [PULL 33/36] bsd-user: Add glue for getfh and related syscalls Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 35/36] bsd-user: Add getdents and fcntl " Warner Losh
` (2 subsequent siblings)
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
Add glue to call the following syscalls to the freebsd_syscall:
freebsd11_statfs
statfs
freebsd11_fstatfs
fstatfs
freebsd11_getfsstat
getfsstat
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/os-syscall.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 73616a5be08..916a754bf8b 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -552,6 +552,30 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_freebsd_fhstatfs(arg1, arg2);
break;
+ case TARGET_FREEBSD_NR_freebsd11_statfs: /* statfs(2) */
+ ret = do_freebsd11_statfs(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_statfs: /* statfs(2) */
+ ret = do_freebsd_statfs(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_fstatfs: /* fstatfs(2) */
+ ret = do_freebsd11_fstatfs(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_fstatfs: /* fstatfs(2) */
+ ret = do_freebsd_fstatfs(arg1, arg2);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_getfsstat: /* getfsstat(2) */
+ ret = do_freebsd11_getfsstat(arg1, arg2, arg3);
+ break;
+
+ case TARGET_FREEBSD_NR_getfsstat: /* getfsstat(2) */
+ ret = do_freebsd_getfsstat(arg1, arg2, arg3);
+ break;
+
/*
* sys{ctl, arch, call}
*/
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 35/36] bsd-user: Add getdents and fcntl related system calls
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (33 preceding siblings ...)
2023-08-28 23:38 ` [PULL 34/36] bsd-user: Add glue for statfs related system calls Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-28 23:38 ` [PULL 36/36] bsd-user: Add missing break after do_bsd_preadv Warner Losh
2023-08-29 13:50 ` [PULL 00/36] 2023q3 bsd user patches Stefan Hajnoczi
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans, Karim Taha,
Richard Henderson
Add glue to call the following syscalls to the freebsd_syscall:
freebsd11_getdents
getdirentries
freebsd11_getdirentries
fcntl
Signed-off-by: Warner Losh <imp@bsdimp.com>
Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-syscall.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index 916a754bf8b..e9b1b663af4 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -576,6 +576,22 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
ret = do_freebsd_getfsstat(arg1, arg2, arg3);
break;
+ case TARGET_FREEBSD_NR_freebsd11_getdents: /* getdents(2) */
+ ret = do_freebsd11_getdents(arg1, arg2, arg3);
+ break;
+
+ case TARGET_FREEBSD_NR_getdirentries: /* getdirentries(2) */
+ ret = do_freebsd_getdirentries(arg1, arg2, arg3, arg4);
+ break;
+
+ case TARGET_FREEBSD_NR_freebsd11_getdirentries: /* getdirentries(2) */
+ ret = do_freebsd11_getdirentries(arg1, arg2, arg3, arg4);
+ break;
+ case TARGET_FREEBSD_NR_fcntl: /* fcntl(2) */
+ ret = do_freebsd_fcntl(arg1, arg2, arg3);
+ break;
+
+
/*
* sys{ctl, arch, call}
*/
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* [PULL 36/36] bsd-user: Add missing break after do_bsd_preadv
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (34 preceding siblings ...)
2023-08-28 23:38 ` [PULL 35/36] bsd-user: Add getdents and fcntl " Warner Losh
@ 2023-08-28 23:38 ` Warner Losh
2023-08-29 13:50 ` [PULL 00/36] 2023q3 bsd user patches Stefan Hajnoczi
36 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-28 23:38 UTC (permalink / raw)
To: qemu-devel
Cc: Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans,
Philippe Mathieu-Daudé, Richard Henderson
Without it, we'd call preadv, then write with weird parameters, which is
clearly not ideal...
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Fixes: 770d8abae7 ("bsd-user/bsd-file.h: Meat of the write system calls")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230820045419.89691-1-imp@bsdimp.com>
---
bsd-user/freebsd/os-syscall.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index e9b1b663af4..fa60df529ef 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -240,6 +240,7 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_FREEBSD_NR_preadv: /* preadv(2) */
ret = do_bsd_preadv(cpu_env, arg1, arg2, arg3, arg4, arg5, arg6);
+ break;
case TARGET_FREEBSD_NR_write: /* write(2) */
ret = do_bsd_write(arg1, arg2, arg3);
--
2.41.0
^ permalink raw reply related [flat|nested] 41+ messages in thread* Re: [PULL 00/36] 2023q3 bsd user patches
2023-08-28 23:37 [PULL 00/36] 2023q3 bsd user patches Warner Losh
` (35 preceding siblings ...)
2023-08-28 23:38 ` [PULL 36/36] bsd-user: Add missing break after do_bsd_preadv Warner Losh
@ 2023-08-29 13:50 ` Stefan Hajnoczi
2023-08-29 15:32 ` Warner Losh
2023-08-29 17:30 ` Peter Maydell
36 siblings, 2 replies; 41+ messages in thread
From: Stefan Hajnoczi @ 2023-08-29 13:50 UTC (permalink / raw)
To: Warner Losh
Cc: qemu-devel, Reinoud Zandijk, Warner Losh, Ryo ONODERA, Kyle Evans
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
Applied, thanks. In the future, please invoke git-request-pull(1) with
the public HTTPS repo URL to make it easier for anyone to fetch the
changes:
> are available in the Git repository at:
>
> git@gitlab.com:bsdimp/qemu.git tags/2023q3-bsd-user-pull-request
^^^^^^^^^^^^^^
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.
Thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PULL 00/36] 2023q3 bsd user patches
2023-08-29 13:50 ` [PULL 00/36] 2023q3 bsd user patches Stefan Hajnoczi
@ 2023-08-29 15:32 ` Warner Losh
2023-08-29 17:30 ` Peter Maydell
1 sibling, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-29 15:32 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: QEMU Developers, Reinoud Zandijk, Ryo ONODERA, Kyle Evans
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
On Tue, Aug 29, 2023, 7:50 AM Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Applied, thanks. In the future, please invoke git-request-pull(1) with
> the public HTTPS repo URL to make it easier for anyone to fetch the
> changes:
>
> > are available in the Git repository at:
> >
> > git@gitlab.com:bsdimp/qemu.git tags/2023q3-bsd-user-pull-request
> ^^^^^^^^^^^^^^
>
Will do. Sorry about that...
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any
> user-visible changes.
>
Once the mmap branch lands... I'll update to include hello world working...
soon I hope...
Warner
Thanks!
>
[-- Attachment #2: Type: text/html, Size: 1556 bytes --]
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PULL 00/36] 2023q3 bsd user patches
2023-08-29 13:50 ` [PULL 00/36] 2023q3 bsd user patches Stefan Hajnoczi
2023-08-29 15:32 ` Warner Losh
@ 2023-08-29 17:30 ` Peter Maydell
2023-08-29 18:38 ` Warner Losh
1 sibling, 1 reply; 41+ messages in thread
From: Peter Maydell @ 2023-08-29 17:30 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: Warner Losh, qemu-devel, Reinoud Zandijk, Ryo ONODERA, Kyle Evans
On Tue, 29 Aug 2023 at 14:51, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>
> Applied, thanks. In the future, please invoke git-request-pull(1) with
> the public HTTPS repo URL to make it easier for anyone to fetch the
> changes:
>
> > are available in the Git repository at:
> >
> > git@gitlab.com:bsdimp/qemu.git tags/2023q3-bsd-user-pull-request
> ^^^^^^^^^^^^^^
Hi; it looks like this broke the clang-user build. Here's
a gitlab CI run on my local branch:
https://gitlab.com/pm215/qemu/-/jobs/4975956600
In file included from ../../linux-user/arm/cpu_loop.c:21:
../../linux-user/qemu.h:210:9: error: 'PRAGMA_DISABLE_PACKED_WARNING'
macro redefined [-Werror,-Wmacro-redefined]
#define PRAGMA_DISABLE_PACKED_WARNING \
^
/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/qemu/compiler.h:42:9:
note: previous definition is here
#define PRAGMA_DISABLE_PACKED_WARNING \
^
1 error generated.
Looks like commit 15b950ecd16ecc added definitions
of PRAGMA_DISABLE_PACKED_WARNING and PRAGMA_REENABLE_PACKED_WARNING
to compiler.h without reconciling them with the
slightly different ones in linux-user/qemu.h.
Can we have a revert (or a quick fix), please ?
thanks
-- PMM
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PULL 00/36] 2023q3 bsd user patches
2023-08-29 17:30 ` Peter Maydell
@ 2023-08-29 18:38 ` Warner Losh
0 siblings, 0 replies; 41+ messages in thread
From: Warner Losh @ 2023-08-29 18:38 UTC (permalink / raw)
To: Peter Maydell
Cc: Stefan Hajnoczi, qemu-devel, Reinoud Zandijk, Ryo ONODERA,
Kyle Evans
[-- Attachment #1: Type: text/plain, Size: 1547 bytes --]
On Tue, Aug 29, 2023 at 11:30 AM Peter Maydell <peter.maydell@linaro.org>
wrote:
> On Tue, 29 Aug 2023 at 14:51, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > Applied, thanks. In the future, please invoke git-request-pull(1) with
> > the public HTTPS repo URL to make it easier for anyone to fetch the
> > changes:
> >
> > > are available in the Git repository at:
> > >
> > > git@gitlab.com:bsdimp/qemu.git tags/2023q3-bsd-user-pull-request
> > ^^^^^^^^^^^^^^
>
> Hi; it looks like this broke the clang-user build. Here's
> a gitlab CI run on my local branch:
> https://gitlab.com/pm215/qemu/-/jobs/4975956600
>
> In file included from ../../linux-user/arm/cpu_loop.c:21:
> ../../linux-user/qemu.h:210:9: error: 'PRAGMA_DISABLE_PACKED_WARNING'
> macro redefined [-Werror,-Wmacro-redefined]
> #define PRAGMA_DISABLE_PACKED_WARNING \
> ^
> /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/qemu/compiler.h:42:9:
> note: previous definition is here
> #define PRAGMA_DISABLE_PACKED_WARNING \
> ^
> 1 error generated.
>
> Looks like commit 15b950ecd16ecc added definitions
> of PRAGMA_DISABLE_PACKED_WARNING and PRAGMA_REENABLE_PACKED_WARNING
> to compiler.h without reconciling them with the
> slightly different ones in linux-user/qemu.h.
>
> Can we have a revert (or a quick fix), please ?
>
I'll look into right now. I think the solution is simple and I can have
something quickly (1-2 hours tops)
Warner
[-- Attachment #2: Type: text/html, Size: 2220 bytes --]
^ permalink raw reply [flat|nested] 41+ messages in thread