diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch index 14b5338eb2..ceae67be64 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch @@ -16,11 +16,11 @@ Cc: Laurent Vivier <laurent@vivier.eu> linux-user/syscall.c | 153 +++++++++++-------------------------------- 1 file changed, 39 insertions(+), 114 deletions(-) -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 1f8c10f8ef..30d83ed162 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -795,8 +795,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff, +Index: qemu-8.0.0/linux-user/syscall.c +=================================================================== +--- qemu-8.0.0.orig/linux-user/syscall.c ++++ qemu-8.0.0/linux-user/syscall.c +@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, */ #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__) /* Similarly for fcntl. Note that callers must always: @@ -31,7 +31,7 @@ index 1f8c10f8ef..30d83ed162 100644 * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts. */ #ifdef __NR_fcntl64 -@@ -6797,13 +6797,13 @@ static int target_to_host_fcntl_cmd(int cmd) +@@ -6813,13 +6813,13 @@ static int target_to_host_fcntl_cmd(int ret = cmd; break; case TARGET_F_GETLK: @@ -48,7 +48,7 @@ index 1f8c10f8ef..30d83ed162 100644 break; case TARGET_F_GETOWN: ret = F_GETOWN; -@@ -6817,17 +6817,6 @@ static int target_to_host_fcntl_cmd(int cmd) +@@ -6833,17 +6833,6 @@ static int target_to_host_fcntl_cmd(int case TARGET_F_SETSIG: ret = F_SETSIG; break; @@ -66,7 +66,7 @@ index 1f8c10f8ef..30d83ed162 100644 case TARGET_F_SETLEASE: ret = F_SETLEASE; break; -@@ -6879,8 +6868,8 @@ static int target_to_host_fcntl_cmd(int cmd) +@@ -6895,8 +6884,8 @@ static int target_to_host_fcntl_cmd(int * them to 5, 6 and 7 before making the syscall(). Since we make the * syscall directly, adjust to what is supported by the kernel. */ @@ -77,7 +77,7 @@ index 1f8c10f8ef..30d83ed162 100644 } #endif -@@ -6913,55 +6902,11 @@ static int host_to_target_flock(int type) +@@ -6929,55 +6918,11 @@ static int host_to_target_flock(int type return type; } @@ -136,7 +136,7 @@ index 1f8c10f8ef..30d83ed162 100644 abi_short l_type; abi_short l_whence; abi_llong l_start; -@@ -6969,10 +6914,10 @@ struct target_oabi_flock64 { +@@ -6985,10 +6930,10 @@ struct target_oabi_flock64 { abi_int l_pid; } QEMU_PACKED; @@ -149,7 +149,7 @@ index 1f8c10f8ef..30d83ed162 100644 int l_type; if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { -@@ -6993,10 +6938,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, +@@ -7009,10 +6954,10 @@ static inline abi_long copy_from_user_oa return 0; } @@ -163,7 +163,7 @@ index 1f8c10f8ef..30d83ed162 100644 short l_type; if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { -@@ -7014,10 +6959,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr, +@@ -7030,10 +6975,10 @@ static inline abi_long copy_to_user_oabi } #endif @@ -176,7 +176,7 @@ index 1f8c10f8ef..30d83ed162 100644 int l_type; if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { -@@ -7038,10 +6983,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl, +@@ -7054,10 +6999,10 @@ static inline abi_long copy_from_user_fl return 0; } @@ -190,7 +190,7 @@ index 1f8c10f8ef..30d83ed162 100644 short l_type; if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { -@@ -7060,7 +7005,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr, +@@ -7076,7 +7021,7 @@ static inline abi_long copy_to_user_floc static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) { @@ -199,7 +199,7 @@ index 1f8c10f8ef..30d83ed162 100644 #ifdef F_GETOWN_EX struct f_owner_ex fox; struct target_f_owner_ex *target_fox; -@@ -7073,6 +7018,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) +@@ -7089,6 +7034,7 @@ static abi_long do_fcntl(int fd, int cmd switch(cmd) { case TARGET_F_GETLK: @@ -207,7 +207,7 @@ index 1f8c10f8ef..30d83ed162 100644 ret = copy_from_user_flock(&fl64, arg); if (ret) { return ret; -@@ -7082,32 +7028,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) +@@ -7098,32 +7044,11 @@ static abi_long do_fcntl(int fd, int cmd ret = copy_to_user_flock(arg, &fl64); } break; @@ -241,7 +241,7 @@ index 1f8c10f8ef..30d83ed162 100644 if (ret) { return ret; } -@@ -7332,7 +7257,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1 +@@ -7348,7 +7273,7 @@ static inline abi_long target_truncate64 arg2 = arg3; arg3 = arg4; } @@ -250,7 +250,7 @@ index 1f8c10f8ef..30d83ed162 100644 } #endif -@@ -7346,7 +7271,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1, +@@ -7362,7 +7287,7 @@ static inline abi_long target_ftruncate6 arg2 = arg3; arg3 = arg4; } @@ -259,7 +259,7 @@ index 1f8c10f8ef..30d83ed162 100644 } #endif -@@ -8452,7 +8377,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8598,7 +8523,7 @@ static int do_getdents(abi_long dirfd, a void *tdirp; int hlen, hoff, toff; int hreclen, treclen; @@ -268,7 +268,7 @@ index 1f8c10f8ef..30d83ed162 100644 hdirp = g_try_malloc(count); if (!hdirp) { -@@ -8505,7 +8430,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8651,7 +8576,7 @@ static int do_getdents(abi_long dirfd, a * Return what we have, resetting the file pointer to the * location of the first record not returned. */ @@ -277,7 +277,7 @@ index 1f8c10f8ef..30d83ed162 100644 break; } -@@ -8539,7 +8464,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8685,7 +8610,7 @@ static int do_getdents64(abi_long dirfd, void *tdirp; int hlen, hoff, toff; int hreclen, treclen; @@ -286,7 +286,7 @@ index 1f8c10f8ef..30d83ed162 100644 hdirp = g_try_malloc(count); if (!hdirp) { -@@ -8581,7 +8506,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) +@@ -8727,7 +8652,7 @@ static int do_getdents64(abi_long dirfd, * Return what we have, resetting the file pointer to the * location of the first record not returned. */ @@ -295,7 +295,7 @@ index 1f8c10f8ef..30d83ed162 100644 break; } -@@ -11114,7 +11039,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -11158,7 +11083,7 @@ static abi_long do_syscall1(CPUArchState return -TARGET_EFAULT; } } @@ -304,7 +304,7 @@ index 1f8c10f8ef..30d83ed162 100644 unlock_user(p, arg2, ret); return ret; case TARGET_NR_pwrite64: -@@ -11131,7 +11056,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -11175,7 +11100,7 @@ static abi_long do_syscall1(CPUArchState return -TARGET_EFAULT; } } @@ -313,7 +313,7 @@ index 1f8c10f8ef..30d83ed162 100644 unlock_user(p, arg2, 0); return ret; #endif -@@ -11954,14 +11879,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -11998,14 +11923,14 @@ static abi_long do_syscall1(CPUArchState case TARGET_NR_fcntl64: { int cmd; @@ -333,7 +333,7 @@ index 1f8c10f8ef..30d83ed162 100644 } #endif -@@ -11971,7 +11896,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -12015,7 +11940,7 @@ static abi_long do_syscall1(CPUArchState } switch(arg2) { @@ -342,7 +342,7 @@ index 1f8c10f8ef..30d83ed162 100644 ret = copyfrom(&fl, arg3); if (ret) { break; -@@ -11982,8 +11907,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, +@@ -12026,8 +11951,8 @@ static abi_long do_syscall1(CPUArchState } break; @@ -353,6 +353,3 @@ index 1f8c10f8ef..30d83ed162 100644 ret = copyfrom(&fl, arg3); if (ret) { break; --- -2.39.0 - |