Merge 9361f765bf
into 6d7d1fde2f
This commit is contained in:
commit
ca77924899
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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:
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue