From bad56085caa5371de07b2ecf231da2eec1968799 Mon Sep 17 00:00:00 2001 From: cadmic Date: Tue, 6 Aug 2024 11:29:42 -0700 Subject: [PATCH 1/2] Update submodule URL for keycodemapdb --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b76fb450a4..82347b901c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ url = git://git.qemu.org/QemuMacDrivers.git [submodule "ui/keycodemapdb"] path = ui/keycodemapdb - url = git://git.qemu.org/keycodemapdb.git + url = https://gitlab.com/qemu-project/keycodemapdb.git [submodule "capstone"] path = capstone url = git://git.qemu.org/capstone.git From 9361f765bfbb35afc713967d20673c1530660111 Mon Sep 17 00:00:00 2001 From: cadmic Date: Tue, 6 Aug 2024 11:29:45 -0700 Subject: [PATCH 2/2] Fix IRIX syscall for pathconf() --- linux-user/irix/syscall_nr.h | 2 +- linux-user/syscall.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/irix/syscall_nr.h b/linux-user/irix/syscall_nr.h index 8004f61008..5b5d7d4346 100644 --- a/linux-user/irix/syscall_nr.h +++ b/linux-user/irix/syscall_nr.h @@ -247,7 +247,7 @@ #define TARGET_NR_syssgi_setsid (20) #define TARGET_NR_syssgi_setpgid (21) #define TARGET_NR_syssgi_sysconf (22) -#define TARGET_NR_syssgi_pathconf (23) +#define TARGET_NR_syssgi_pathconf (24) #define TARGET_NR_syssgi_setgroups (40) #define TARGET_NR_syssgi_getgroups (41) #define TARGET_NR_syssgi_settimeofday (52) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f9bc06a0dd..619d7b36c2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -14527,13 +14527,13 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } break; case TARGET_NR_syssgi_pathconf: - if (arg3 == 1) { - if (!(p = lock_user_string(arg1))) + if (arg4 == 1) { + if (!(p = lock_user_string(arg2))) goto efault; - ret = get_errno(pathconf(path(p), target_to_host_pathconf(arg2))); + ret = get_errno(pathconf(path(p), target_to_host_pathconf(arg3))); unlock_user(p, arg1, 0); } else - ret = get_errno(fpathconf(arg1, target_to_host_pathconf(arg2))); + ret = get_errno(fpathconf(arg2, target_to_host_pathconf(arg3))); break; case TARGET_NR_syssgi_rusage: {